Author: pebender
Date: Sun Nov 2 10:24:56 2008
New Revision: 3897
Added:
trunk/gar-minimyth/script/X11/xscreensaver/files/xscreensaver-5.07-intltool_disable.patch
Modified:
trunk/gar-minimyth/script/X11/xscreensaver/Makefile
trunk/gar-minimyth/script/X11/xscreensaver/checksums
Log:
- Patched X11/xscreensaver so that it builds with intltool installed.
Modified: trunk/gar-minimyth/script/X11/xscreensaver/Makefile
==============================================================================
--- trunk/gar-minimyth/script/X11/xscreensaver/Makefile (original)
+++ trunk/gar-minimyth/script/X11/xscreensaver/Makefile Sun Nov 2 10:24:56
2008
@@ -3,7 +3,7 @@
CATEGORIES = X11
MASTER_SITES = http://www.jwz.org/$(GARNAME)/
DISTFILES = $(DISTNAME).tar.gz
-PATCHFILES = $(DISTNAME).patch.gar
+PATCHFILES = $(DISTNAME)-intltool_disable.patch $(DISTNAME).patch.gar
LICENSE = MIT
DESCRIPTION =
@@ -11,7 +11,7 @@
endef
DEPENDS = lang/c xorg/xorg lib/libjpeg lib/zlib
-BUILDDEPS = utils/bc
+BUILDDEPS = gtk/glib utils/bc
CONFIGURE_SCRIPTS = $(WORKSRC)/configure
BUILD_SCRIPTS = $(WORKSRC)/Makefile
Modified: trunk/gar-minimyth/script/X11/xscreensaver/checksums
==============================================================================
--- trunk/gar-minimyth/script/X11/xscreensaver/checksums (original)
+++ trunk/gar-minimyth/script/X11/xscreensaver/checksums Sun Nov 2
10:24:56 2008
@@ -1,2 +1,3 @@
55a12fcb5d3a7231c9850ef9d9f82918 download/xscreensaver-5.07.tar.gz
+82e00f60696a14d5bcad6bee40227f55
download/xscreensaver-5.07-intltool_disable.patch
b8dfb76ee537414656dec5c93c309f63 download/xscreensaver-5.07.patch.gar
Added:
trunk/gar-minimyth/script/X11/xscreensaver/files/xscreensaver-5.07-intltool_disable.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/X11/xscreensaver/files/xscreensaver-5.07-intltool_disable.patch
Sun Nov 2 10:24:56 2008
@@ -0,0 +1,57 @@
+diff -Naur xscreensaver-5.07-old/configure.in
xscreensaver-5.07-new/configure.in
+--- xscreensaver-5.07-old/configure.in 2008-08-03 10:57:17.000000000 -0700
++++ xscreensaver-5.07-new/configure.in 2008-11-02 10:01:14.000000000 -0800
+@@ -1172,7 +1172,7 @@
+ #
+
###############################################################################
+
+-AC_PROG_INTLTOOL
++# AC_PROG_INTLTOOL # http://bugs.gentoo.org/show_bug.cgi?id=240958
+ GETTEXT_PACKAGE=xscreensaver
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
+ [This is the name of the gettext package to use.])
+diff -Naur xscreensaver-5.07-old/driver/Makefile.in
xscreensaver-5.07-new/driver/Makefile.in
+--- xscreensaver-5.07-old/driver/Makefile.in 2008-08-10 22:11:59.000000000
-0700
++++ xscreensaver-5.07-new/driver/Makefile.in 2008-11-02 10:01:14.000000000
-0800
+@@ -22,7 +22,7 @@
+ mansuffix = 1
+ manNdir = $(mandir)/man$(mansuffix)
+
+-INTLTOOL_MERGE = @INTLTOOL_MERGE@
++#INTLTOOL_MERGE = @INTLTOOL_MERGE@ #
http://bugs.gentoo.org/show_bug.cgi?id=240958
+
+ GTK_DATADIR = @GTK_DATADIR@
+ GTK_APPDIR = $(GTK_DATADIR)/applications
+@@ -492,20 +492,19 @@
+
+ # screensaver-properties.desktop
+ # into /usr/share/applications/
+-install-gnome:: screensaver-properties.desktop
++install-gnome::
+ @if [ "$(GTK_DATADIR)" != "" ]; then \
+ if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then \
+ echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\
+ $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\
+ fi ;\
+ name2=xscreensaver-properties.desktop ;\
+- echo $(INSTALL_DATA) screensaver-properties.desktop \
++ echo $(INSTALL_DATA) screensaver-properties.desktop.in
\
+ $(install_prefix)$(GTK_APPDIR)/$$name2 ;\
+- $(INSTALL_DATA) screensaver-properties.desktop \
++ $(INSTALL_DATA) screensaver-properties.desktop.in
\
+ $(install_prefix)$(GTK_APPDIR)/$$name2 ;\
+ fi
+
+-
+ # xscreensaver.xpm
+ # into /usr/share/pixmaps/
+ install-gnome:: $(LOGO)
+@@ -764,7 +763,7 @@
+ XScreenSaver_Xm_ad.h: XScreenSaver-Xm.ad
+ $(SHELL) $(UTILS_SRC)/ad2c XScreenSaver-Xm.ad > XScreenSaver_Xm_ad.h
+
[EMAIL PROTECTED]@
++# @INTLTOOL_DESKTOP_RULE@ # http://bugs.gentoo.org/show_bug.cgi?id=240958
+
+ # The executables linked in this directory.
+ #
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
