summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2007-09-15 14:47:55 +0000
committerRoy Marples <uberlord@gentoo.org>2007-09-15 14:47:55 +0000
commit98190dd4ddbb1d7373ccb256f2cf3327e2d1598b (patch)
treef276c7267be22ed1a70bd53e1e9d84075b027829 /app-editors/gedit/files
parentstable on x86, wrt security bug #190833 (diff)
downloadgentoo-2-98190dd4ddbb1d7373ccb256f2cf3327e2d1598b.tar.gz
gentoo-2-98190dd4ddbb1d7373ccb256f2cf3327e2d1598b.tar.bz2
gentoo-2-98190dd4ddbb1d7373ccb256f2cf3327e2d1598b.zip
Fix the fbsd patch for Makefile.am as well as we now autoreconf
(Portage version: 2.1.3.9)
Diffstat (limited to 'app-editors/gedit/files')
-rw-r--r--app-editors/gedit/files/gedit-2.18.1-fbsd.patch14
1 files changed, 12 insertions, 2 deletions
diff --git a/app-editors/gedit/files/gedit-2.18.1-fbsd.patch b/app-editors/gedit/files/gedit-2.18.1-fbsd.patch
index 523658b58e93..d4bb5b135e6c 100644
--- a/app-editors/gedit/files/gedit-2.18.1-fbsd.patch
+++ b/app-editors/gedit/files/gedit-2.18.1-fbsd.patch
@@ -1,7 +1,6 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gedit-2.18.1.orig/plugins/externaltools/data/Makefile.in gedit-2.18.1/plugins/externaltools/data/Makefile.in
--- gedit-2.18.1.orig/plugins/externaltools/data/Makefile.in 2007-04-10 05:00:01.000000000 -0400
+++ gedit-2.18.1/plugins/externaltools/data/Makefile.in 2007-07-05 20:39:29.000000000 -0400
-@@ -475,7 +475,7 @@ uninstall-am: uninstall-info-am uninstal
+@@ -468,7 +468,7 @@
# (.desktop), which happens to be translated using intltool.
$(tools_SCRIPTS): %: %.tool.in %.desktop $(TOOL_MERGE)
perl $(TOOL_MERGE) -o $@ $< $(word 2,$^)
@@ -10,3 +9,14 @@ diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gedit-2.18.1.orig/plugin
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+--- gedit-2.18.1.orig/plugins/externaltools/data/Makefile.am.orig 2007-09-15 15:26:32 +0100
++++ gedit-2.18.1.orig/plugins/externaltools/data/Makefile.am 2007-09-15 15:40:09 +0100
+@@ -17,7 +17,7 @@
+ # (.desktop), which happens to be translated using intltool.
+ $(tools_SCRIPTS): %: %.tool.in %.desktop $(TOOL_MERGE)
+ perl $(TOOL_MERGE) -o $@ $< $(word 2,$^)
+- chmod --reference=$< $@
++ chmod 0755 $@
+
+ EXTRA_DIST = \
+ $(desktop_in_files) \