Magellan Linux

Contents of /trunk/xscreensaver/patches/xscreensaver-5.08-no-intltool.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 788 - (show annotations) (download)
Fri May 8 07:54:53 2009 UTC (15 years ago) by niro
File size: 2277 byte(s)
intltool patch

1 diff -ur xscreensaver-5.07_old/configure.in xscreensaver-5.07/configure.in
2 --- xscreensaver-5.07_old/configure.in 2008-10-16 02:15:57.761938178 +0200
3 +++ xscreensaver-5.07/configure.in 2008-10-16 02:11:43.311971411 +0200
4 @@ -1172,7 +1172,7 @@
5 #
6 ###############################################################################
7
8 -AC_PROG_INTLTOOL
9 +# AC_PROG_INTLTOOL # http://bugs.gentoo.org/show_bug.cgi?id=240958
10 GETTEXT_PACKAGE=xscreensaver
11 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
12 [This is the name of the gettext package to use.])
13 diff -ur xscreensaver-5.07_old/driver/Makefile.in xscreensaver-5.07/driver/Makefile.in
14 --- xscreensaver-5.07_old/driver/Makefile.in 2008-10-16 02:15:57.835271514 +0200
15 +++ xscreensaver-5.07/driver/Makefile.in 2008-10-16 03:16:51.678244563 +0200
16 @@ -22,7 +22,7 @@
17 mansuffix = 1
18 manNdir = $(mandir)/man$(mansuffix)
19
20 -INTLTOOL_MERGE = @INTLTOOL_MERGE@
21 +#INTLTOOL_MERGE = @INTLTOOL_MERGE@ # http://bugs.gentoo.org/show_bug.cgi?id=240958
22
23 GTK_DATADIR = @GTK_DATADIR@
24 GTK_APPDIR = $(GTK_DATADIR)/applications
25 @@ -492,20 +492,19 @@
26
27 # screensaver-properties.desktop
28 # into /usr/share/applications/
29 -install-gnome:: screensaver-properties.desktop
30 +install-gnome::
31 @if [ "$(GTK_DATADIR)" != "" ]; then \
32 if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then \
33 echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\
34 $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\
35 fi ;\
36 name2=xscreensaver-properties.desktop ;\
37 - echo $(INSTALL_DATA) screensaver-properties.desktop \
38 + echo $(INSTALL_DATA) screensaver-properties.desktop.in \
39 $(install_prefix)$(GTK_APPDIR)/$$name2 ;\
40 - $(INSTALL_DATA) screensaver-properties.desktop \
41 + $(INSTALL_DATA) screensaver-properties.desktop.in \
42 $(install_prefix)$(GTK_APPDIR)/$$name2 ;\
43 fi
44
45 -
46 # xscreensaver.xpm
47 # into /usr/share/pixmaps/
48 install-gnome:: $(LOGO)
49 @@ -764,7 +763,7 @@
50 XScreenSaver_Xm_ad.h: XScreenSaver-Xm.ad
51 $(SHELL) $(UTILS_SRC)/ad2c XScreenSaver-Xm.ad > XScreenSaver_Xm_ad.h
52
53 -@INTLTOOL_DESKTOP_RULE@
54 +# @INTLTOOL_DESKTOP_RULE@ # http://bugs.gentoo.org/show_bug.cgi?id=240958
55
56 # The executables linked in this directory.
57 #