packages: gwget/gwget.spec, gwget/epiphany-30.patch (NEW) - add support for...

lisu lisu at pld-linux.org
Thu Apr 7 16:28:27 CEST 2011


Author: lisu                         Date: Thu Apr  7 14:28:27 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add support for epiphany 3.0

---- Files affected:
packages/gwget:
   gwget.spec (1.39 -> 1.40) , epiphany-30.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gwget/gwget.spec
diff -u packages/gwget/gwget.spec:1.39 packages/gwget/gwget.spec:1.40
--- packages/gwget/gwget.spec:1.39	Thu Apr  7 15:49:20 2011
+++ packages/gwget/gwget.spec	Thu Apr  7 16:28:22 2011
@@ -16,6 +16,7 @@
 # Source0-md5:	b65ebc752cad068e747ae6ef45fafdcc
 Patch0:		epiphany-230.patch
 Patch1:		%{name}-libnotify.patch
+Patch2:		epiphany-30.patch
 URL:		http://www.gnome.org/projects/gwget/
 BuildRequires:	GConf2-devel
 BuildRequires:	autoconf
@@ -58,6 +59,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__intltoolize}
@@ -118,6 +120,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2011/04/07 14:28:22  lisu
+- add support for epiphany 3.0
+
 Revision 1.39  2011/04/07 13:49:20  lisu
 - fixes build with libnotify 0.7
 

================================================================
Index: packages/gwget/epiphany-30.patch
diff -u /dev/null packages/gwget/epiphany-30.patch:1.1
--- /dev/null	Thu Apr  7 16:28:27 2011
+++ packages/gwget/epiphany-30.patch	Thu Apr  7 16:28:22 2011
@@ -0,0 +1,36 @@
+--- gwget-1.0.4/configure.ac~	2011-04-07 16:05:05.943174946 +0200
++++ gwget-1.0.4/configure.ac	2011-04-07 16:07:38.896513284 +0200
+@@ -96,11 +96,11 @@
+ 
+ EPHY_VER=
+ AC_ARG_WITH([epiphany-version],
+-        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14|2.16|2.18|2.20|2.22|2.24|2.26|2.28|2.30@:>@],
+-                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 or 2.16 or 2.18 or 2.20 or 2.22 or 2.24 or 2.26 or 2.28 or 2.30 (default 1.6)]),
++        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14|2.16|2.18|2.20|2.22|2.24|2.26|2.28|2.30|3.0.0@:>@],
++                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 or 2.16 or 2.18 or 2.20 or 2.22 or 2.24 or 2.26 or 2.28 or 2.30 or 3.0 (default 1.6)]),
+         [EPHY_VER="$withval"])
+ 
+-dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16, 2.17, 2.18, 2.19, 2.20, 2.21, 2.22, 2.23, 2.24, 2.25, 2.26, 2.27 or 2.28 or 2.30
++dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16, 2.17, 2.18, 2.19, 2.20, 2.21, 2.22, 2.23, 2.24, 2.25, 2.26, 2.27 or 2.28 or 2.30 or 3.0
+ EPHY_AUTODETECT="(autodetect)"
+ if pkg-config --exists epiphany-2.29; then
+         EPHY_VER=2.29
+@@ -235,13 +235,17 @@
+ 	  EPIPHANY_PKGCONFIG=epiphany-2.29
+           EPIPHANY_REQUIRED=2.30
+ 	  EPIPHANY_SHORTVER=230
++elif test "x$EPHY_VER" = "x3.0"; then
++	  EPIPHANY_PKGCONFIG=epiphany-3.0
++	  EPIPHANY_REQUIRED=3.0
++	  EPIPHANY_SHORTVER=300
+ else
+      	AC_MSG_RESULT([no epiphany installed])
+ fi
+ 
+ if test -n "$EPIPHANY_SHORTVER" ; then
+ AC_DEFINE_UNQUOTED(EPHY_VERSION, $EPIPHANY_SHORTVER,
+-       [Define to the Epiphany version (12, 14, 16, 18, 110, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227 or 228 or 230)])
++       [Define to the Epiphany version (12, 14, 16, 18, 110, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227 or 228 or 230 or 3.0)])
+ AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
+ 
+ LIBGLIB_REQUIRED=2.4.0
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gwget/gwget.spec?r1=1.39&r2=1.40&f=u



More information about the pld-cvs-commit mailing list