Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19990
Modified Files:
gnome-terminal.info gnome-terminal.patch
Log Message:
new version
Index: gnome-terminal.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-terminal.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gnome-terminal.info 9 Nov 2008 15:26:06 -0000 1.10
+++ gnome-terminal.info 20 Jan 2009 06:18:17 -0000 1.11
@@ -1,5 +1,5 @@
Package: gnome-terminal
-Version: 2.24.1.1
+Version: 2.24.3
Revision: 1
Depends: <<
atk1-shlibs (>= 1.24.0-1),
@@ -84,11 +84,11 @@
Conflicts: gnome-core (<< 2.0.0)
Replaces: gnome-panel
Source: mirror:gnome:sources/%n/2.24/%n-%v.tar.bz2
-Source-MD5: a98418c2c28a1b745df739b88401276b
-#PatchFile: %n.patch
-#PatchFile-MD5: 7449dcd10cb2b49431efec154bb29e70
+Source-MD5: 03f099985da576d774075e30430d29da
+PatchFile: %n.patch
+PatchFile-MD5: 3ad387a90778f76407247e78bce7edc2
PatchScript: <<
-# %{default_script}
+ %{default_script}
perl -pi -e 's/(-scrollkeeper-update)/#\1/' help/*/Makefile.in
<<
SetCFLAGS: -Os -fno-common
@@ -120,7 +120,5 @@
when "fort77" is installed.
<<
DescPort: <<
- Put -I and -L from pkg-config (fink packages) before x11's
- Put local -I before global in src/skey
- See: http://bugzilla.gnome.org/show_bug.cgi?id=536899
+ Some -I placement cleanups to make sure fink's -I come first.
<<
Index: gnome-terminal.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-terminal.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gnome-terminal.patch 15 Jul 2008 01:40:58 -0000 1.2
+++ gnome-terminal.patch 20 Jan 2009 06:18:17 -0000 1.3
@@ -1,26 +1,30 @@
-diff -Nurd -x'*~' gnome-terminal-2.18.4.orig/configure
gnome-terminal-2.18.4/configure
---- gnome-terminal-2.18.4.orig/configure 2008-01-07 16:54:32.000000000
-0500
-+++ gnome-terminal-2.18.4/configure 2008-06-05 03:54:29.000000000 -0400
-@@ -24239,8 +24239,8 @@
- :
- fi
+diff -Nurd -x'*~' gnome-terminal-2.24.3.orig/src/Makefile.in
gnome-terminal-2.24.3/src/Makefile.in
+--- gnome-terminal-2.24.3.orig/src/Makefile.in 2009-01-12 10:03:22.000000000
-0500
++++ gnome-terminal-2.24.3/src/Makefile.in 2009-01-12 17:42:13.000000000
-0500
+@@ -327,10 +327,10 @@
+ -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
+ -DGTK_DISABLE_SINGLE_INCLUDES \
+ $(DISABLE_DEPRECATED) \
++ $(TERM_CFLAGS) \
+ $(AM_CPPFLAGS)
--TERM_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $TERM_LIBS"
--TERM_CFLAGS="$X_CFLAGS $TERM_CFLAGS"
-+TERM_LIBS="$TERM_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-+TERM_CFLAGS="$TERM_CFLAGS $X_CFLAGS"
- CPPFLAGS="$TERM_CFLAGS $CPPFLAGS"
+ gnome_terminal_CFLAGS = \
+- $(TERM_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CFLAGS)
- # Extract the first word of "gconftool-2", so it can be a program name with
args.
-diff -Nurd -x'*~' gnome-terminal-2.18.4.orig/src/skey/Makefile.in
gnome-terminal-2.18.4/src/skey/Makefile.in
---- gnome-terminal-2.18.4.orig/src/skey/Makefile.in 2008-01-07
16:54:28.000000000 -0500
-+++ gnome-terminal-2.18.4/src/skey/Makefile.in 2008-06-05 03:37:18.000000000
-0400
-@@ -242,7 +242,7 @@
- top_srcdir = @top_srcdir@
+diff -Nurd -x'*~' gnome-terminal-2.24.3.orig/src/skey/Makefile.in
gnome-terminal-2.24.3/src/skey/Makefile.in
+--- gnome-terminal-2.24.3.orig/src/skey/Makefile.in 2009-01-12
10:03:22.000000000 -0500
++++ gnome-terminal-2.24.3/src/skey/Makefile.in 2009-01-12 17:42:31.000000000
-0500
+@@ -268,10 +268,10 @@
+ -I$(srcdir)/.. \
+ -DG_DISABLE_SINGLE_INCLUDES \
+ $(DISABLE_DEPRECATED) \
++ $(TERM_CFLAGS) \
+ $(AM_CPPFLAGS)
+
+ libskey_la_CFLAGS = \
+- $(TERM_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CFLASG)
- ### FIXME
--INCLUDES = @TERM_CFLAGS@ -I$(srcdir)/..
-+INCLUDES = -I$(srcdir)/.. @TERM_CFLAGS@
- SKEYFILES = \
- btoe.c \
- btoe.h \
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
