summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2013-05-01 23:41:23 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2013-05-01 23:41:23 +0800
commit054ebc2cf53f4c312eb3631b053860766a3907fd (patch)
tree36b279e4cbc9bf67c1a8940e0ee52c1291d80fac
parent60addcc08314d7f2af59d504bc86a378fb6f506c (diff)
downloadmarcuscom-ports-054ebc2cf53f4c312eb3631b053860766a3907fd.tar
marcuscom-ports-054ebc2cf53f4c312eb3631b053860766a3907fd.tar.gz
marcuscom-ports-054ebc2cf53f4c312eb3631b053860766a3907fd.tar.bz2
marcuscom-ports-054ebc2cf53f4c312eb3631b053860766a3907fd.tar.lz
marcuscom-ports-054ebc2cf53f4c312eb3631b053860766a3907fd.tar.xz
marcuscom-ports-054ebc2cf53f4c312eb3631b053860766a3907fd.tar.zst
marcuscom-ports-054ebc2cf53f4c312eb3631b053860766a3907fd.zip
Remove unneeded patches and sync with ports.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18411 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--accessibility/orca/files/patch-configure11
-rw-r--r--multimedia/totem/Makefile2
-rw-r--r--multimedia/totem/files/patch-configure9
3 files changed, 1 insertions, 21 deletions
diff --git a/accessibility/orca/files/patch-configure b/accessibility/orca/files/patch-configure
deleted file mode 100644
index 19247d9a0..000000000
--- a/accessibility/orca/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2010-10-10 12:06:22.000000000 -0400
-+++ configure 2010-10-10 12:06:40.000000000 -0400
-@@ -5867,7 +5867,7 @@ except ImportError:
- except:
- sys.exit(0)
- sys.exit(0)"
--if $PYTHON -c "$prog" 1>&5 2>&5
-+if dbus-launch $PYTHON -c "$prog" 1>&5 2>&5
- then
- eval "py_cv_mod_$py_mod_var=yes"
- else
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 1d465f38e..ef119da14 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -24,7 +24,7 @@ CONFLICTS= totem-3.[0-9]*
USE_PYTHON= yes
USE_BZIP2= yes
-USES= gettext pathfix pkgconfig desktop-file-utils
+USES= pathfix gettext pkgconfig desktop-file-utils
USE_GNOME= gnomeprefix intlhack nautilus2 ltverhack pygtk2 gnomehier
USE_GSTREAMER= core gconf hal good mpeg2dec soup ugly python gio
INSTALLS_ICONS= yes
diff --git a/multimedia/totem/files/patch-configure b/multimedia/totem/files/patch-configure
index 4c6a3519c..eb555a5a7 100644
--- a/multimedia/totem/files/patch-configure
+++ b/multimedia/totem/files/patch-configure
@@ -1,14 +1,5 @@
--- configure.orig 2010-10-10 12:15:41.000000000 -0400
+++ configure 2010-10-10 12:18:12.000000000 -0400
-@@ -18343,7 +18343,7 @@ for good_element in gconfaudiosink gconf
- do
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking GStreamer 0.10 $good_element plugin" >&5
- $as_echo_n "checking GStreamer 0.10 $good_element plugin... " >&6; }
-- if $gst010_inspect $good_element >/dev/null 2>/dev/null; then
-+ if dbus-launch $gst010_inspect $good_element >/dev/null 2>/dev/null; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- else
@@ -21139,7 +21139,9 @@ if test "$enable_browser_plugins" = "yes
$as_echo "#define ENABLE_BROWSER_PLUGINS 1" >>confdefs.h