- applied upstream

Changed files:
    gwget-buildfix.patch -> 1.2
    gwget-epiphany.patch -> 1.2
    gwget-libnotify.patch -> 1.2

diff --git a/gwget-buildfix.patch b/gwget-buildfix.patch
deleted file mode 100644 (file)
index 83a45ec..0000000
--- a/gwget-buildfix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN aaa/gwget-0.98.1/src/main_window_cb.c gwget-0.98.1/src/main_window_cb.c
---- aaa/gwget-0.98.1/src/main_window_cb.c      2006-05-04 21:06:00.000000000 +0200
-+++ gwget-0.98.1/src/main_window_cb.c  2006-08-13 12:50:08.343672750 +0200
-@@ -24,7 +24,7 @@
- #include <libgnome/gnome-init.h>
- #include <libgnomevfs/gnome-vfs-utils.h>
- #include <libgnomevfs/gnome-vfs-mime-utils.h>
--#include <gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime.h>
-+#include <libgnomevfs/gnome-vfs-mime.h>
- 
- #include "main_window.h"
- #include "main_window_cb.h"

diff --git a/gwget-epiphany.patch b/gwget-epiphany.patch
deleted file mode 100644 (file)
index f688061..0000000
--- a/gwget-epiphany.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -urN aaa/gwget-0.98.1/configure.in gwget-0.98.1/configure.in
---- aaa/gwget-0.98.1/configure.in      2006-05-07 20:06:52.000000000 +0200
-+++ gwget-0.98.1/configure.in  2006-08-13 12:38:05.614505000 +0200
-@@ -99,9 +99,11 @@
-                        [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 (default 1.6)]),
-         [EPHY_VER="$withval"])
- 
--dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10 or 2.14
-+dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14 or 2.15
- EPHY_AUTODETECT="(autodetect)"
--if pkg-config --exists epiphany-2.14; then
-+if pkg-config --exists epiphany-2.15; then
-+        EPHY_VER=2.15
-+elif pkg-config --exists epiphany-2.14; then
-         EPHY_VER=2.14
- elif pkg-config --exists epiphany-1.10; then
-         EPHY_VER=1.10
-@@ -144,13 +146,17 @@
-           EPIPHANY_PKGCONFIG=epiphany-2.14
-           EPIPHANY_REQUIRED=2.14
-           EPIPHANY_SHORTVER=214
-+elif test "x$EPHY_VER" = "x2.15"; then
-+          EPIPHANY_PKGCONFIG=epiphany-2.15
-+          EPIPHANY_REQUIRED=2.15
-+          EPIPHANY_SHORTVER=215
- 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 or 214)])
-+       [Define to the Epiphany version (12, 14, 16, 18, 110, 214 or 215)])
- AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
- 
- LIBGLIB_REQUIRED=2.4.0

diff --git a/gwget-libnotify.patch b/gwget-libnotify.patch
deleted file mode 100644 (file)
index 5879d6b..0000000
--- a/gwget-libnotify.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gwget-0.98/src/eggtrayicon.c~      2006-04-10 21:49:18.000000000 +0200
-+++ gwget-0.98/src/eggtrayicon.c       2006-05-18 12:11:38.043991435 +0200
-@@ -569,7 +569,7 @@
- 
-   if (pixbuf)
-     {
--#if (LIBNOTIFY_VERSION_MICRO < 2)
-+#if (LIBNOTIFY_VERSION_MICRO < 2) && (LIBNOTIFY_VERSION_MINOR < 4)
-       notify_notification_set_icon_data_from_pixbuf (icon->notify->handle, pixbuf);
- #else
-       notify_notification_set_icon_from_pixbuf (icon->notify->handle, pixbuf);