| 1 |
yngwin 08/11/05 20:30:53 |
| 2 |
|
| 3 |
Added: 03_all_no_intltool.patch |
| 4 |
Log: |
| 5 |
Add no-intltool patch to fix bug 240958 and demo-gtk patch for 5.05 to fix bug 225547. |
| 6 |
(Portage version: 2.2_rc13/cvs/Linux 2.6.26-hh3 i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 x11-misc/xscreensaver/files/5.06/03_all_no_intltool.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.06/03_all_no_intltool.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/5.06/03_all_no_intltool.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: 03_all_no_intltool.patch |
| 15 |
=================================================================== |
| 16 |
diff -ur xscreensaver-5.07_old/configure.in xscreensaver-5.07/configure.in |
| 17 |
--- xscreensaver-5.07_old/configure.in 2008-10-16 02:15:57.761938178 +0200 |
| 18 |
+++ xscreensaver-5.07/configure.in 2008-10-16 02:11:43.311971411 +0200 |
| 19 |
@@ -1172,7 +1172,7 @@ |
| 20 |
# |
| 21 |
############################################################################### |
| 22 |
|
| 23 |
-AC_PROG_INTLTOOL |
| 24 |
+# AC_PROG_INTLTOOL # http://bugs.gentoo.org/show_bug.cgi?id=240958 |
| 25 |
GETTEXT_PACKAGE=xscreensaver |
| 26 |
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", |
| 27 |
[This is the name of the gettext package to use.]) |
| 28 |
diff -ur xscreensaver-5.07_old/driver/Makefile.in xscreensaver-5.07/driver/Makefile.in |
| 29 |
--- xscreensaver-5.07_old/driver/Makefile.in 2008-10-16 02:15:57.835271514 +0200 |
| 30 |
+++ xscreensaver-5.07/driver/Makefile.in 2008-10-16 03:16:51.678244563 +0200 |
| 31 |
@@ -22,7 +22,7 @@ |
| 32 |
mansuffix = 1 |
| 33 |
manNdir = $(mandir)/man$(mansuffix) |
| 34 |
|
| 35 |
-INTLTOOL_MERGE = @INTLTOOL_MERGE@ |
| 36 |
+#INTLTOOL_MERGE = @INTLTOOL_MERGE@ # http://bugs.gentoo.org/show_bug.cgi?id=240958 |
| 37 |
|
| 38 |
GTK_DATADIR = @GTK_DATADIR@ |
| 39 |
GTK_APPDIR = $(GTK_DATADIR)/applications |
| 40 |
@@ -492,20 +492,19 @@ |
| 41 |
|
| 42 |
# screensaver-properties.desktop |
| 43 |
# into /usr/share/applications/ |
| 44 |
-install-gnome:: screensaver-properties.desktop |
| 45 |
+install-gnome:: |
| 46 |
@if [ "$(GTK_DATADIR)" != "" ]; then \ |
| 47 |
if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then \ |
| 48 |
echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ |
| 49 |
$(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ |
| 50 |
fi ;\ |
| 51 |
name2=xscreensaver-properties.desktop ;\ |
| 52 |
- echo $(INSTALL_DATA) screensaver-properties.desktop \ |
| 53 |
+ echo $(INSTALL_DATA) screensaver-properties.desktop.in \ |
| 54 |
$(install_prefix)$(GTK_APPDIR)/$$name2 ;\ |
| 55 |
- $(INSTALL_DATA) screensaver-properties.desktop \ |
| 56 |
+ $(INSTALL_DATA) screensaver-properties.desktop.in \ |
| 57 |
$(install_prefix)$(GTK_APPDIR)/$$name2 ;\ |
| 58 |
fi |
| 59 |
|
| 60 |
- |
| 61 |
# xscreensaver.xpm |
| 62 |
# into /usr/share/pixmaps/ |
| 63 |
install-gnome:: $(LOGO) |
| 64 |
@@ -764,7 +763,7 @@ |
| 65 |
XScreenSaver_Xm_ad.h: XScreenSaver-Xm.ad |
| 66 |
$(SHELL) $(UTILS_SRC)/ad2c XScreenSaver-Xm.ad > XScreenSaver_Xm_ad.h |
| 67 |
|
| 68 |
-@INTLTOOL_DESKTOP_RULE@ |
| 69 |
+# @INTLTOOL_DESKTOP_RULE@ # http://bugs.gentoo.org/show_bug.cgi?id=240958 |
| 70 |
|
| 71 |
# The executables linked in this directory. |
| 72 |
# |
Archives