gnome/epiphany 2.30.2
authoryselkowitz <yselkowitz@e127d73d-b18e-4ae1-a744-a22e6a3ccd30>
Mon, 28 Jun 2010 10:56:50 +0000 (10:56 +0000)
committeryselkowitz <yselkowitz@e127d73d-b18e-4ae1-a744-a22e6a3ccd30>
Mon, 28 Jun 2010 10:56:50 +0000 (10:56 +0000)
git-svn-id: https://cygwin-ports.svn.sourceforge.net/svnroot/cygwin-ports/ports/trunk@9839 e127d73d-b18e-4ae1-a744-a22e6a3ccd30

2.28-gtk-doc1.13.patch [deleted file]
2.28-introspection.patch [deleted file]
2.30-implib.patch [moved from 2.27-implib.patch with 65% similarity]
2.30-introspection.patch [new file with mode: 0644]
epiphany-2.30.2-1.cygport [moved from epiphany-2.28.2-1.cygport with 80% similarity]
epiphany.hint

diff --git a/2.28-gtk-doc1.13.patch b/2.28-gtk-doc1.13.patch
deleted file mode 100644 (file)
index 40634ec..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- origsrc/epiphany-2.28.2/doc/reference/Makefile.am  2009-12-16 04:26:26.000000000 -0600
-+++ src/epiphany-2.28.2/doc/reference/Makefile.am      2010-01-21 23:03:02.844390300 -0600
-@@ -242,7 +242,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_
-       cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-       test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-       @echo '-- Fixing Crossreferences' 
--      cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-+      cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-       touch html-build.stamp
- endif
diff --git a/2.28-introspection.patch b/2.28-introspection.patch
deleted file mode 100644 (file)
index e3f41de..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
---- origsrc/epiphany-2.28.1/src/Makefile.am    2009-11-04 15:10:45.285696800 -0600
-+++ src/epiphany-2.28.1/src/Makefile.am        2009-11-04 15:11:08.716937700 -0600
-@@ -318,7 +318,7 @@ EPHY_GIR_H_FILES = \
-       $(top_srcdir)/src/ephy-window.h \
-       $(NULL)
--Epiphany-$(EPIPHANY_API_VERSION).gir: $(G_IR_SCANNER) $(EPHY_GIR_H_FILES) epiphany
-+Epiphany-$(EPIPHANY_API_VERSION).gir: $(G_IR_SCANNER) $(EPHY_GIR_H_FILES) epiphany$(EXEEXT)
-       $(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
-       $(G_IR_SCANNER) -v \
-               --namespace Epiphany \
-@@ -328,7 +328,7 @@ Epiphany-$(EPIPHANY_API_VERSION).gir: $(
-               --include=Gtk-2.0 \
-               --include=libxml2-2.0 \
-               --include=WebKit-1.0 \
--              --program=./epiphany \
-+              --program=./epiphany$(EXEEXT) \
-               --output $@ \
-               --pkg epiphany-$(EPIPHANY_API_VERSION) \
-               -DEPIPHANY_COMPILATION \
similarity index 65%
rename from 2.27-implib.patch
rename to 2.30-implib.patch
index 272aef5df842f0d4ee2407b8d18bbd1d2d500966..cb26c21f6d2581e50762dcc81cb1f2caa2951b0a 100644 (file)
@@ -1,6 +1,6 @@
---- origsrc/epiphany-2.27.1/configure.ac       2009-03-16 13:08:49.000000000 -0500
-+++ src/epiphany-2.27.1/configure.ac   2009-03-30 01:17:53.875000000 -0500
-@@ -432,6 +432,19 @@ AM_CONDITIONAL([ENABLE_NETWORK_MANAGER],
+--- origsrc/epiphany-2.30.2/configure.ac       2010-04-08 09:55:44.000000000 -0500
++++ src/epiphany-2.30.2/configure.ac   2010-06-28 03:23:08.182638400 -0500
+@@ -366,6 +366,19 @@ AM_CONDITIONAL([ENABLE_NETWORK_MANAGER],
  # uninstalled share dir to search data
  AC_DEFINE_UNQUOTED([SHARE_UNINSTALLED_DIR], ["`pwd`/data"], [path to source data dir])
  
@@ -20,8 +20,8 @@
  # *******************************
  # Add warning flags
  # *******************************
---- origsrc/epiphany-2.27.1/data/epiphany.pc.in        2009-02-02 03:52:49.000000000 -0600
-+++ src/epiphany-2.27.1/data/epiphany.pc.in    2009-03-30 01:15:31.015625000 -0500
+--- origsrc/epiphany-2.30.2/data/epiphany.pc.in        2010-04-08 09:09:30.000000000 -0500
++++ src/epiphany-2.30.2/data/epiphany.pc.in    2010-06-28 03:23:08.189638800 -0500
 @@ -13,5 +13,5 @@ Name: Epiphany Browser
  Description: GNOME Web Browser
  Version: @VERSION@
@@ -29,9 +29,9 @@
 -Libs: -L${libdir}
 +Libs: -L${libdir} @EPHY_IMPLIB@
  Cflags: -I${includedir}
---- origsrc/epiphany-2.27.1/src/Makefile.am    2009-03-13 02:28:07.000000000 -0500
-+++ src/epiphany-2.27.1/src/Makefile.am        2009-03-30 01:22:13.109375000 -0500
-@@ -221,6 +221,10 @@ epiphany_CFLAGS = \
+--- origsrc/epiphany-2.30.2/src/Makefile.am    2010-04-08 09:09:41.000000000 -0500
++++ src/epiphany-2.30.2/src/Makefile.am        2010-06-28 03:23:41.821562500 -0500
+@@ -157,6 +157,10 @@ epiphany_CFLAGS = \
  
  epiphany_LDFLAGS = -dlopen self
  
  epiphany_LDADD = \
        libephymain.la \
        $(top_builddir)/src/bookmarks/libephybookmarks.la \
-@@ -590,3 +594,10 @@ EXTRA_DIST += Epiphany-$(EPIPHANY_API_VE
+@@ -368,3 +372,9 @@ Epiphany-$(EPIPHANY_API_VERSION).typelib
  CLEANFILES += $(gir_DATA) $(typelibs_DATA)
  
- endif # ENABLE_INTROSPECTION
+ endif # HAVE_INTROSPECTION
 +
 +if PLATFORM_WIN32
 +install-data-local:
 +      $(mkinstalldirs) $(DESTDIR)$(libdir)
 +      $(INSTALL_DATA) libepiphany-$(EPIPHANY_API_VERSION).a $(DESTDIR)$(libdir)
 +endif
-+
diff --git a/2.30-introspection.patch b/2.30-introspection.patch
new file mode 100644 (file)
index 0000000..b7375e6
--- /dev/null
@@ -0,0 +1,20 @@
+--- origsrc/epiphany-2.30.2/src/Makefile.am    2010-04-08 09:09:41.000000000 -0500
++++ src/epiphany-2.30.2/src/Makefile.am        2010-06-28 03:23:41.821562500 -0500
+@@ -334,7 +334,7 @@ EPHY_GIR_C_FILES = \
+       $(NULL)
+ Epiphany-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILES) \
+-                                      $(EPHY_GIR_C_FILES) epiphany
++                                      $(EPHY_GIR_C_FILES) epiphany$(EXEEXT)
+       $(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
+       $(INTROSPECTION_SCANNER) -v \
+               --namespace Epiphany \
+@@ -344,7 +344,7 @@ Epiphany-$(EPIPHANY_API_VERSION).gir: $(
+               --include=Gtk-2.0 \
+               --include=libxml2-2.0 \
+               --include=WebKit-1.0 \
+-              --program=./epiphany \
++              --program=./epiphany$(EXEEXT) \
+               --output $@ \
+               --pkg epiphany-$(EPIPHANY_API_VERSION) \
+               -DEPIPHANY_COMPILATION \
similarity index 80%
rename from epiphany-2.28.2-1.cygport
rename to epiphany-2.30.2-1.cygport
index 68fa3925e7f105adc4ba8beb799ac11854fa5709..2587cd2f4793faeac41401e00484377c3b7f622a 100644 (file)
@@ -2,9 +2,10 @@ inherit gnome2
 
 DESCRIPTION="GNOME web browser"
 
-PATCH_URI="2.27-implib.patch
-           2.28-gtk-doc1.13.patch
-           2.28-introspection.patch"
+PATCH_URI="
+       2.30-implib.patch
+       2.30-introspection.patch
+"
 
 PKG_NAMES="${PN} ${PN}-devel"
 epiphany_CONTENTS="--exclude=aclocal --exclude=gir-1.0 --exclude=gtk-doc
@@ -16,6 +17,6 @@ CYGCONF_ARGS="
        --enable-introspection
        --enable-seed
        --disable-network-manager
-       --disable-nss
        --disable-zeroconf
+       --without-ca-file
 "
index 182f41c527b710fe2b97438764bd0ae5a761fa78..f588e67cce15006c2e594c52d105eb55fb6919da 100644 (file)
@@ -1,5 +1,5 @@
 category: Gnome Web
-requires: GConf2 gobject-introspection-Gtk2.0 gobject-introspection-Soup2.4 gobject-introspection-WebKit1.0 libdbus-glib_1_2 libdbus1_3 libgcc1 libgconf2_4 libgdk_pixbuf2.0_0 libglib2.0_0 libgirepository1.0_0 libgnome-keyring0 libgtk2.0_0 libICE6 libintl8 libnotify1 libpango1.0_0 libseed0 libSM6 libsoup2.4_1 libsoup-gnome2.4_1 libwebkit1.0_2 libX11_6 libxml2 libxslt
+requires: GConf2 gobject-introspection-Gtk2.0 gobject-introspection-Soup2.4 gobject-introspection-WebKit1.0 libdbus-glib_1_2 libdbus1_3 libgcc1 libgconf2_4 libgdk_pixbuf2.0_0 libglib2.0_0 libgirepository1.0_0 libgnome-keyring0 libgtk2.0_0 libICE6 libintl8 libnotify1 libnspr4 libnss3 libpango1.0_0 libseed0 libSM6 libsoup2.4_1 libsoup-gnome2.4_1 libwebkit1.0_2 libX11_6 libxml2 libxslt
 sdesc: "GNOME web browser"
 ldesc: "Epiphany is the web browser for the GNOME desktop. Its goal is 
 to be simple and easy to use. Epiphany ties together many GNOME 
This page took 0.030382 seconds and 5 git commands to generate.