epiphany 3.0.0
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Fri, 15 Apr 2011 02:51:42 +0000 (21:51 -0500)
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Fri, 15 Apr 2011 02:51:42 +0000 (21:51 -0500)
2.30-implib.patch
2.30-introspection.patch [deleted file]
3.0.0-introspection.patch [new file with mode: 0644]
epiphany-3.0.0-1.cygport [moved from epiphany-2.30.6-2.cygport with 59% similarity]
epiphany-devel.hint
epiphany.hint

index cb26c21f6d2581e50762dcc81cb1f2caa2951b0a..22e66f0644748f750db71d0c22395949257cf30b 100644 (file)
@@ -25,7 +25,7 @@
 @@ -13,5 +13,5 @@ Name: Epiphany Browser
  Description: GNOME Web Browser
  Version: @VERSION@
- Requires: gtk+-2.0, libxml-2.0, webkit-1.0
+ Requires: gtk+-3.0, libxml-2.0, webkitgtk-3.0
 -Libs: -L${libdir}
 +Libs: -L${libdir} @EPHY_IMPLIB@
  Cflags: -I${includedir}
diff --git a/2.30-introspection.patch b/2.30-introspection.patch
deleted file mode 100644 (file)
index 5494b18..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
---- origsrc/epiphany-2.30.6/src/Makefile.am
-+++ src/epiphany-2.30.6/src/Makefile.am
-@@ -334,17 +334,19 @@ 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 \
-               --nsversion=$(EPIPHANY_API_VERSION) \
-               --add-include-path=. \
-               --add-include-path=$(srcdir) \
-+              --identifier-prefix=Ephy \
-+              --symbol-prefix=ephy_ \
-               --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 \
diff --git a/3.0.0-introspection.patch b/3.0.0-introspection.patch
new file mode 100644 (file)
index 0000000..a9e026d
--- /dev/null
@@ -0,0 +1,20 @@
+--- origsrc/epiphany-3.0.0/src/Makefile.am     2011-03-07 14:38:38.000000000 -0600
++++ src/epiphany-3.0.0/src/Makefile.am 2011-04-11 22:28:10.685433000 -0500
+@@ -346,7 +346,7 @@ EphyEgg-$(EPIPHANY_API_VERSION).gir: $(I
+               $(top_builddir)/lib/egg/libegg.la
+ Epiphany-$(EPIPHANY_API_VERSION).gir: EphyEgg-$(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 --warn-all \
+               --identifier-prefix=Ephy \
+@@ -359,7 +359,7 @@ Epiphany-$(EPIPHANY_API_VERSION).gir: Ep
+               --include=libxml2-2.0 \
+               --include=WebKit-3.0 \
+               --include-uninstalled=EphyEgg-$(EPIPHANY_API_VERSION).gir \
+-              --program=./epiphany \
++              --program=./epiphany$(EXEEXT) \
+               --output=$@ \
+               --pkg=epiphany-$(EPIPHANY_API_VERSION) \
+               -DEPIPHANY_COMPILATION \
similarity index 59%
rename from epiphany-2.30.6-2.cygport
rename to epiphany-3.0.0-1.cygport
index 2587cd2f4793faeac41401e00484377c3b7f622a..0785093cdb02028bc3f2c7041d16dba6b8739d19 100644 (file)
@@ -4,18 +4,19 @@ DESCRIPTION="GNOME web browser"
 
 PATCH_URI="
        2.30-implib.patch
-       2.30-introspection.patch
+       3.0.0-introspection.patch
+       3.0.0-webkitgtk-1_3_12.patch
 "
 
 PKG_NAMES="${PN} ${PN}-devel"
 epiphany_CONTENTS="--exclude=aclocal --exclude=gir-1.0 --exclude=gtk-doc
-                   etc/ usr/bin/ usr/lib/girepository-1.0/ usr/share/"
+                   etc/ usr/bin/ usr/share/"
 epiphany_devel_CONTENTS="usr/include/ usr/lib/lib* usr/lib/pkgconfig usr/share/aclocal/
-                         usr/share/gir-1.0/ usr/share/gtk-doc/"
+                         usr/share/gtk-doc/"
 
+# introspection: only need for Seed-based plugins (currently nonexistant)
 CYGCONF_ARGS="
-       --enable-introspection
-       --enable-seed
+       --disable-introspection
        --disable-network-manager
        --disable-zeroconf
        --without-ca-file
index 8946524d160ba59c8f09ae4e87505b545a609ef0..d303c3499eb66667aa064a8f2bef4b6813db1205 100644 (file)
@@ -1,5 +1,5 @@
 category: Gnome Web
-requires: epiphany libdbus-glib_1-devel libglib2.0-devel libgtk2.0-devel libwebkit1.0-devel libxml2-devel
+requires: epiphany libdbus-glib_1-devel libglib2.0-devel libgtk3-devel libwebkitgtk3.0-devel libxml2-devel
 external-source: epiphany
 sdesc: "GNOME web browser (plugin development files)"
 ldesc: "Epiphany is the web browser for the GNOME desktop. Its goal is 
index a20f98c247b08f6fa7936c49c4649820e2be2283..c49972ba188420dd6140d30a48416543f318778c 100644 (file)
@@ -1,5 +1,5 @@
 category: Gnome Web
-requires: GConf2 gobject-introspection-Gtk2.0 gobject-introspection-Soup2.4 gobject-introspection-WebKit1.0 libcairo2 libdbus-glib_1_2 libdbus1_3 libgconf2_4 libgdk_pixbuf2.0_0 libglib2.0_0 libgirepository1.0_1 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
+requires: libcairo2 libdbus-glib_1_2 libdbus1_3 libgdk_pixbuf2.0_0 libglib2.0_0 libgnome-keyring0 libgtk3_0 libICE6 libintl8 libnspr4 libnss3 libpango1.0_0 libSM6 libsoup2.4_1 libsoup-gnome2.4_1 libwebkitgtk3.0_0 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.025072 seconds and 5 git commands to generate.