Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/gnome
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18218/10.7/main/finkinfo/gnome
Modified Files:
gtkhtml3.14-dev.info gtkhtml3.14-dev.patch
Log Message:
flag fixes
Index: gtkhtml3.14-dev.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/gnome/gtkhtml3.14-dev.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gtkhtml3.14-dev.patch 29 Jul 2011 03:04:00 -0000 1.1
+++ gtkhtml3.14-dev.patch 10 Mar 2013 08:17:12 -0000 1.2
@@ -1,24 +1,12 @@
-diff -Nurd -x'*~' gtkhtml-3.28.3.orig/components/editor/Makefile.in
gtkhtml-3.28.3/components/editor/Makefile.in
---- gtkhtml-3.28.3.orig/components/editor/Makefile.in 2010-03-01
04:16:50.000000000 -0500
-+++ gtkhtml-3.28.3/components/editor/Makefile.in 2010-03-09
19:11:53.000000000 -0500
-@@ -393,7 +393,7 @@
-
- libgtkhtml_editor_la_LIBADD = \
- @GTKHTML_LIBS@ \
-- $(top_builddir)/gtkhtml/libgtkhtml-@[email protected]
-+ $(top_builddir)/gtkhtml/libgtkhtml-@[email protected] $(INTLLIBS)
-
- libgtkhtml_editor_la_LDFLAGS = -no-undefined
- gtkhtml_editor_test_SOURCES = main.c
diff -Nurd -x'*~' gtkhtml-3.28.3.orig/gtkhtml/Makefile.in
gtkhtml-3.28.3/gtkhtml/Makefile.in
--- gtkhtml-3.28.3.orig/gtkhtml/Makefile.in 2010-03-01 04:16:50.000000000
-0500
-+++ gtkhtml-3.28.3/gtkhtml/Makefile.in 2010-03-09 19:00:04.000000000 -0500
-@@ -609,7 +609,7 @@
- gtest_LDFLAGS =
- gtest_LDADD = \
- libgtkhtml-@[email protected] \
-- $(GTKHTML_LIBS)
-+ $(GTKHTML_LIBS) $(INTLLIBS)
++++ gtkhtml-3.28.3/gtkhtml/Makefile.in 2013-03-10 03:56:44.000000000 -0400
+@@ -590,7 +590,7 @@
+ $(NULL)
- test_suite_SOURCES = \
- test-suite.c
+ libgtkhtml_3_14_la_LDFLAGS = -version-info
$(GTKHTML_CURRENT):$(GTKHTML_REVISION):$(GTKHTML_AGE) -no-undefined
+-libgtkhtml_3_14_la_LIBADD = $(GTKHTML_LIBS) ../a11y/libgtkhtml-a11y.la
$(GAIL_LIBS) $(REGEX_LIBS)
++libgtkhtml_3_14_la_LIBADD = $(GTKHTML_LIBS) ../a11y/libgtkhtml-a11y.la
$(GAIL_LIBS) $(REGEX_LIBS) $(INTLLIBS)
+ @HAVE_SOUP_TRUE@test_programs = testgtkhtml
+ testgtkhtml_SOURCES = \
+ testgtkhtml.c \
Index: gtkhtml3.14-dev.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/gnome/gtkhtml3.14-dev.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gtkhtml3.14-dev.info 29 Jul 2011 03:04:00 -0000 1.1
+++ gtkhtml3.14-dev.info 10 Mar 2013 08:17:12 -0000 1.2
@@ -1,26 +1,23 @@
Package: gtkhtml3.14-dev
Version: 3.28.3
-Revision: 3
+Revision: 4
Depends: gtkhtml3.14-shlibs (= %v-%r)
BuildDepends: <<
atk1 (>= 1.28.0-1),
- cairo (>= 1.8.8-3),
+ cairo (>= 1.12.8-1),
enchant1-dev (>= 1.4.2-2),
- expat1,
fink (>= 0.24.12),
fink-package-precedence,
- fontconfig2-dev (>= 2.8.0-4),
- freetype219 (>= 2.3.12-1),
+ fontconfig2-dev (>= 2.10.0-1),
+ freetype219 (>= 2.4.11-1),
gconf2-dev (>= 2.28.0-1),
gettext-bin,
gettext-tools (>= 0.17),
glib2-dev (>= 2.22.0-1),
- glitz,
gtk+2-dev (>= 2.18.0-1),
intltool40,
libgettext8-dev,
pango1-xft2-ft219-dev (>= 1.24.5-4),
- pixman (>= 0.16.0-1),
pkgconfig (>= 0.23),
x11-dev
<<
@@ -28,25 +25,25 @@
BuildConflicts: freetype, freetype-hinting, libsoup-ssl
InfoTest: <<
TestDepends: <<
- libsoup2.4.1-ssl (>= 2.28.0-1)
+ libsoup2.4.1-ssl (>= 2.28.0-1),
+ xvfb-run
+ <<
+ TestScript: <<
+ # requires active dbus (not avail to fink-bld user)
+ # xvfb-run make -C gtkhtml test-verbose
<<
-# tests require x11 display
-# cd src; DYLD_LIBRARY_PATH=.libs make test
-# cd src; DYLD_LIBRARY_PATH=.libs make stress-test
<<
Source: mirror:gnome:sources/gtkhtml/3.28/gtkhtml-%v.tar.bz2
Source-MD5: f9756ff2c9e43139ef4726f9d332cd1c
PatchFile: %n.patch
-PatchFile-MD5: 17e790fc44bedca9a99b2603d92166b5
+PatchFile-MD5: da0730397032c18a2479742d30d74e44
PatchScript: <<
%{default_script}
# fix non-portable (requires bash-3) syntax in doltlib configs
perl -pi.bak -e 's|args\+\=.*|args=\(\$\{args\[\@\]\} \"\$arg\"\)|'
configure
<<
-SetCPPFLAGS: -I%p/lib/fontconfig2/include
-SetLDFLAGS: -L%p/lib/fontconfig2/lib
SetCFLAGS: -Os
-ConfigureParams: --enable-dependency-tracking --libexecdir=%p/lib
--disable-static
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
--disable-silent-rules
+ConfigureParams: --enable-dependency-tracking --libexecdir=%p/lib
--disable-static
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:$PKG_CONFIG_PATH"
--disable-silent-rules
CompileScript: <<
./configure %c
make
@@ -70,18 +67,17 @@
Package: gtkhtml3.14-shlibs
Depends: <<
atk1-shlibs (>= 1.28.0-1),
- cairo-shlibs (>= 1.8.8-3),
+ cairo-shlibs (>= 1.12.8-1),
enchant1-shlibs (>= 1.4.2-2),
- fontconfig2-shlibs (>= 2.8.0-4),
- freetype219-shlibs (>= 2.3.12-1),
+ fontconfig2-shlibs (>= 2.10.0-1),
+ freetype219-shlibs (>= 2.4.11-1),
gconf2-shlibs (>= 2.28.0-1),
glib2-shlibs (>= 2.22.0-1),
gnome-icon-theme (>= 2.28.0-1),
gtk+2-shlibs (>= 2.18.0-1),
libgettext8-shlibs,
iso-codes,
- pango1-xft2-ft219-shlibs (>= 1.24.5-4),
- x11
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4)
<<
Conflicts: gtkhtml3
Replaces: gtkhtml3, gtkhtml3.8.15 (<< 3.10.1-1)
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
