diff options
| author | jsa <jsa@FreeBSD.org> | 2012-01-09 12:09:41 +0800 |
|---|---|---|
| committer | jsa <jsa@FreeBSD.org> | 2012-01-09 12:09:41 +0800 |
| commit | 615767aad6506113e73b44d1639d3bbb14f132cb (patch) | |
| tree | ff79eaa1b6cef9b612384c77eaf20b9a87817323 /multimedia/vlc | |
| parent | e15c279e0dbade3b3f925cd59c1a42e7f20def7d (diff) | |
| download | freebsd-ports-gnome-615767aad6506113e73b44d1639d3bbb14f132cb.tar.gz freebsd-ports-gnome-615767aad6506113e73b44d1639d3bbb14f132cb.tar.zst freebsd-ports-gnome-615767aad6506113e73b44d1639d3bbb14f132cb.zip | |
Remove now redundant #include patch, and fix conflicting 7.x patch.
Approved by: wxs (mentor)
Diffstat (limited to 'multimedia/vlc')
| -rw-r--r-- | multimedia/vlc/files/extra-patch-modules__misc__inhibit__xdg.c | 11 | ||||
| -rw-r--r-- | multimedia/vlc/files/patch-modules__misc__inhibit__xdg.c | 10 |
2 files changed, 5 insertions, 16 deletions
diff --git a/multimedia/vlc/files/extra-patch-modules__misc__inhibit__xdg.c b/multimedia/vlc/files/extra-patch-modules__misc__inhibit__xdg.c index 048050c655d1..7355179899d3 100644 --- a/multimedia/vlc/files/extra-patch-modules__misc__inhibit__xdg.c +++ b/multimedia/vlc/files/extra-patch-modules__misc__inhibit__xdg.c @@ -1,14 +1,13 @@ -B ---- ./modules/misc/inhibit/xdg.c.orig 2011-11-25 13:17:54.000000000 -0500 -+++ ./modules/misc/inhibit/xdg.c 2011-11-25 13:31:37.000000000 -0500 -@@ -26,7 +26,6 @@ - #include <vlc_plugin.h> +--- ./modules/misc/inhibit/xdg.c.orig 2011-11-22 15:30:36.000000000 -0500 ++++ ./modules/misc/inhibit/xdg.c 2012-01-08 15:29:41.000000000 -0500 +@@ -27,7 +27,6 @@ #include <vlc_inhibit.h> #include <assert.h> + #include <signal.h> -#include <spawn.h> #include <sys/wait.h> - #include <signal.h> + static int Open (vlc_object_t *); @@ -47,7 +46,6 @@ vlc_thread_t thread; vlc_cond_t update, inactive; diff --git a/multimedia/vlc/files/patch-modules__misc__inhibit__xdg.c b/multimedia/vlc/files/patch-modules__misc__inhibit__xdg.c deleted file mode 100644 index 229c7637742e..000000000000 --- a/multimedia/vlc/files/patch-modules__misc__inhibit__xdg.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ./modules/misc/inhibit/xdg.c.orig 2011-11-13 19:05:10.000000000 -0500 -+++ ./modules/misc/inhibit/xdg.c 2011-11-13 19:06:20.000000000 -0500 -@@ -28,6 +28,7 @@ - #include <assert.h> - #include <spawn.h> - #include <sys/wait.h> -+#include <signal.h> - - static int Open (vlc_object_t *); - static void Close (vlc_object_t *); |