From 04688fe19b66bf5ae7f9832745e2bb228887a201 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 4 Jul 2011 11:33:04 +0100 Subject: Update to 3.1.3 --- .gitignore | 1 + copy.xsl | 30 ---------- cpufreq-selector.app | 1 - cpufreq-selector.pam | 4 -- gnome-applets-2.15.1.1-dont-require-display.patch | 14 ----- gnome-applets-2.15.2-use-old-modemlights.patch | 57 ------------------- gnome-applets-2.23.3-use-builtin-apm.patch | 16 ------ gnome-applets-2.3.6-ppp-command.patch | 21 ------- gnome-applets-dbus-glib.patch | 12 ---- gnome-applets-libs.patch | 38 ------------- gnome-applets-no-mixer-icon.patch | 11 ---- gnome-applets-notify.patch | 13 ----- gnome-applets-null-battstat.patch | 68 ---------------------- gnome-applets.spec | 69 +++-------------------- modemlights-libgnome.patch | 66 ---------------------- ppp-includes.patch | 12 ---- pymod-check.patch | 24 -------- seriesid-clash.patch | 12 ---- sources | 2 +- stickynotes-null.patch | 65 --------------------- 20 files changed, 9 insertions(+), 527 deletions(-) delete mode 100644 copy.xsl delete mode 100644 cpufreq-selector.app delete mode 100644 cpufreq-selector.pam delete mode 100644 gnome-applets-2.15.1.1-dont-require-display.patch delete mode 100644 gnome-applets-2.15.2-use-old-modemlights.patch delete mode 100644 gnome-applets-2.23.3-use-builtin-apm.patch delete mode 100644 gnome-applets-2.3.6-ppp-command.patch delete mode 100644 gnome-applets-dbus-glib.patch delete mode 100644 gnome-applets-libs.patch delete mode 100644 gnome-applets-no-mixer-icon.patch delete mode 100644 gnome-applets-notify.patch delete mode 100644 gnome-applets-null-battstat.patch delete mode 100644 modemlights-libgnome.patch delete mode 100644 ppp-includes.patch delete mode 100644 pymod-check.patch delete mode 100644 seriesid-clash.patch delete mode 100644 stickynotes-null.patch diff --git a/.gitignore b/.gitignore index 4d6bf6e..5b5617a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ gnome-applets-2.31.6.tar.bz2 /gnome-applets-2.32.0.tar.bz2 /gnome-applets-3.1.1.tar.bz2 /gnome-applets-3.1.2.tar.xz +/gnome-applets-3.1.3.tar.xz diff --git a/copy.xsl b/copy.xsl deleted file mode 100644 index 0e64463..0000000 --- a/copy.xsl +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cpufreq-selector.app b/cpufreq-selector.app deleted file mode 100644 index 6a738ec..0000000 --- a/cpufreq-selector.app +++ /dev/null @@ -1 +0,0 @@ -FALLBACK=true diff --git a/cpufreq-selector.pam b/cpufreq-selector.pam deleted file mode 100644 index 34bb38a..0000000 --- a/cpufreq-selector.pam +++ /dev/null @@ -1,4 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_console.so -account required pam_permit.so diff --git a/gnome-applets-2.15.1.1-dont-require-display.patch b/gnome-applets-2.15.1.1-dont-require-display.patch deleted file mode 100644 index f6fcada..0000000 --- a/gnome-applets-2.15.1.1-dont-require-display.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- gnome-applets-2.15.1.1/configure.in.dont-require-display 2006-08-02 11:43:36.000000000 -0400 -+++ gnome-applets-2.15.1.1/configure.in 2006-08-02 11:44:55.000000000 -0400 -@@ -545,8 +545,9 @@ dnl *** invest-applet specific checks - dnl *************************************************************************** - - if test "x$HAVE_PYGTK" = "xyes" -a "x$HAVE_PYHDRS" = "xyes"; then -- AM_CHECK_PYMOD(gnomeapplet,, -- BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no") -+dnl AM_CHECK_PYMOD(gnomeapplet,, -+dnl BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no") -+ BUILD_INVEST_APPLET="yes" - else - BUILD_INVEST_APPLET="no" - fi diff --git a/gnome-applets-2.15.2-use-old-modemlights.patch b/gnome-applets-2.15.2-use-old-modemlights.patch deleted file mode 100644 index f0bef45..0000000 --- a/gnome-applets-2.15.2-use-old-modemlights.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -up gnome-applets-2.31.90.1/configure.in.use-old-modemlights gnome-applets-2.31.90.1/configure.in ---- gnome-applets-2.31.90.1/configure.in.use-old-modemlights 2010-08-18 18:30:01.000000000 -0400 -+++ gnome-applets-2.31.90.1/configure.in 2010-08-19 19:40:12.344849004 -0400 -@@ -126,6 +126,11 @@ PKG_CHECK_MODULES(GNOME_APPLETS3, libpan - AC_SUBST(GNOME_APPLETS3_CFLAGS) - AC_SUBST(GNOME_APPLETS3_LIBS) - -+dnl -- check for libgnome (required) ------------------------------------------ -+PKG_CHECK_MODULES(GNOME_LIBS2, libgnome-2.0 libgnomeui-2.0) -+AC_SUBST(GNOME_LIBS2_CFLAGS) -+AC_SUBST(GNOME_LIBS2_LIBS) -+ - dnl -- check for gnome-desktop (required) ------------------------------------- - PKG_CHECK_MODULES(GNOMEDESKTOP, gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) - AC_SUBST(GNOMEDESKTOP_CFLAGS) -@@ -407,12 +412,10 @@ if test x$disable_battstat = xno; then - case "${host}" in - powerpc-*-linux*) - NEED_LIBAPM=yes -- AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no]) - ;; - # list of supported OS cores that use libapm - *-*-linux*) - NEED_LIBAPM=yes -- AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no]) - ;; - # list of supported OS cores that do not use libapm - i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu) -@@ -554,14 +557,16 @@ fi - AM_CONDITIONAL(BUILD_CPUFREQ_APPLET, test x$build_cpufreq_applet = xyes) - AM_CONDITIONAL(BUILD_CPUFREQ_SELECTOR, test x$enable_selector = xyes) - AM_CONDITIONAL(CPUFREQ_SELECTOR_SUID, test x$suid = xyes) -+AM_CONDITIONAL(APPLET_MODEMLIGHTS, true) - - dnl *************************************************************************** - dnl *** invest-applet specific checks *** - dnl *************************************************************************** - - if test "x$HAVE_PYGTK" = "xyes" -a "x$HAVE_PYHDRS" = "xyes"; then -- AM_CHECK_PYMOD(gnomeapplet,, -- BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no") -+dnl AM_CHECK_PYMOD(gnomeapplet,, -+dnl BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no") -+ BUILD_INVEST_APPLET="yes" - else - BUILD_INVEST_APPLET="no" - fi -@@ -688,6 +693,9 @@ mini-commander/help/Makefile - drivemount/Makefile - drivemount/help/Makefile - modemlights/Makefile -+modemlights/docs/Makefile -+modemlights/docs/C/Makefile -+modemlights/docs/eu/Makefile - multiload/Makefile - multiload/docs/Makefile - gkb-new/Makefile diff --git a/gnome-applets-2.23.3-use-builtin-apm.patch b/gnome-applets-2.23.3-use-builtin-apm.patch deleted file mode 100644 index c91aadb..0000000 --- a/gnome-applets-2.23.3-use-builtin-apm.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up gnome-applets-2.23.3/configure.in.use-builtin-apm gnome-applets-2.23.3/configure.in ---- gnome-applets-2.23.3/configure.in.use-builtin-apm 2008-07-31 21:52:11.000000000 -0400 -+++ gnome-applets-2.23.3/configure.in 2008-07-31 21:53:29.000000000 -0400 -@@ -414,12 +414,10 @@ if test x$disable_battstat = xno; then - case "${host}" in - powerpc-*-linux*) - NEED_LIBAPM=yes -- AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no]) - ;; - # list of supported OS cores that use libapm - *-*-linux*) - NEED_LIBAPM=yes -- AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no]) - ;; - # list of supported OS cores that do not use libapm - i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu) diff --git a/gnome-applets-2.3.6-ppp-command.patch b/gnome-applets-2.3.6-ppp-command.patch deleted file mode 100644 index 2cb1526..0000000 --- a/gnome-applets-2.3.6-ppp-command.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up gnome-applets-2.23.4/modemlights/modemlights.schemas.in.ppp-command gnome-applets-2.23.4/modemlights/modemlights.schemas.in ---- gnome-applets-2.23.4/modemlights/modemlights.schemas.in.ppp-command 2003-07-26 08:50:45.000000000 -0400 -+++ gnome-applets-2.23.4/modemlights/modemlights.schemas.in 2008-08-04 23:27:17.000000000 -0400 -@@ -27,7 +27,7 @@ - /schemas/apps/modemlights/prefs/connect - modemlights_applet2 - string -- pppon -+ /sbin/ifup ppp0 - - Command executed when connecting - Use this command to connect the modem. -@@ -38,7 +38,7 @@ - /schemas/apps/modemlights/prefs/disconnect - modemlights_applet2 - string -- pppoff -+ /sbin/ifdown ppp0 - - Command executed when disconnecting - Use this command to disconnect the modem. diff --git a/gnome-applets-dbus-glib.patch b/gnome-applets-dbus-glib.patch deleted file mode 100644 index fcece10..0000000 --- a/gnome-applets-dbus-glib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gnome-applets-2.32.0/configure.in.dbus-glib gnome-applets-2.32.0/configure.in ---- gnome-applets-2.32.0/configure.in.dbus-glib 2010-11-03 16:46:18.251241996 -0400 -+++ gnome-applets-2.32.0/configure.in 2010-11-03 16:46:55.642242004 -0400 -@@ -273,7 +273,7 @@ AC_SUBST(XML2_LIBS) - - dnl -- check for libgweather (required for gweather applet) ------------------ - build_libgweather_applets=false --PKG_CHECK_MODULES(LIBGWEATHER, gweather >= $GWEATHER_REQUIRED, -+PKG_CHECK_MODULES(LIBGWEATHER, gweather >= $GWEATHER_REQUIRED dbus-glib-1, - build_libgweather_applets=true, - AC_MSG_WARN([libgweather not found. Not building the weather applet.])) - AC_SUBST(LIBGWEATHER_CFLAGS) diff --git a/gnome-applets-libs.patch b/gnome-applets-libs.patch deleted file mode 100644 index b2b3347..0000000 --- a/gnome-applets-libs.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up gnome-applets-2.31.90.1/geyes/Makefile.am.libs gnome-applets-2.31.90.1/geyes/Makefile.am ---- gnome-applets-2.31.90.1/geyes/Makefile.am.libs 2010-08-18 15:59:16.000000000 -0400 -+++ gnome-applets-2.31.90.1/geyes/Makefile.am 2010-08-19 20:02:37.640849001 -0400 -@@ -16,7 +16,8 @@ geyes_applet2_SOURCES = \ - geyes.h - - geyes_applet2_LDADD = \ -- $(GNOME_APPLETS3_LIBS) -+ $(GNOME_APPLETS3_LIBS) \ -+ -lm - - appletdir = $(datadir)/gnome-panel/applets - applet_in_files = org.gnome.applets.GeyesApplet.panel-applet.in -diff -up gnome-applets-2.31.90.1/multiload/Makefile.am.libs gnome-applets-2.31.90.1/multiload/Makefile.am ---- gnome-applets-2.31.90.1/multiload/Makefile.am.libs 2010-08-18 15:59:16.000000000 -0400 -+++ gnome-applets-2.31.90.1/multiload/Makefile.am 2010-08-19 20:03:22.087849003 -0400 -@@ -24,7 +24,8 @@ multiload_applet_2_SOURCES = \ - multiload_applet_2_LDADD = \ - $(GNOME_APPLETS3_LIBS) \ - $(GTOP_APPLETS_LIBS) \ -- $(GNOMEDESKTOP_LIBS) -+ $(GNOMEDESKTOP_LIBS) \ -+ -lm - - schemasdir = @GCONF_SCHEMA_FILE_DIR@ - schemas_in_files = multiload.schemas.in -diff -up gnome-applets-2.31.90.1/trashapplet/src/Makefile.am.libs gnome-applets-2.31.90.1/trashapplet/src/Makefile.am ---- gnome-applets-2.31.90.1/trashapplet/src/Makefile.am.libs 2010-08-18 15:59:16.000000000 -0400 -+++ gnome-applets-2.31.90.1/trashapplet/src/Makefile.am 2010-08-19 20:03:52.609849003 -0400 -@@ -14,6 +14,7 @@ trashapplet_SOURCES = \ - - trashapplet_LDADD = \ - $(GNOME_APPLETS3_LIBS) \ -- $(GIO_LIBS) -+ $(GIO_LIBS) \ -+ -lX11 - - -include $(top_srcdir)/git.mk diff --git a/gnome-applets-no-mixer-icon.patch b/gnome-applets-no-mixer-icon.patch deleted file mode 100644 index 79b57cf..0000000 --- a/gnome-applets-no-mixer-icon.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up gnome-applets-2.25.90/null_applet/GNOME_MixerApplet.server.in.no-mixer-icon gnome-applets-2.25.90/null_applet/GNOME_MixerApplet.server.in ---- gnome-applets-2.25.90/null_applet/GNOME_MixerApplet.server.in.no-mixer-icon 2009-02-06 14:31:43.000000000 -0500 -+++ gnome-applets-2.25.90/null_applet/GNOME_MixerApplet.server.in 2009-02-06 14:32:54.000000000 -0500 -@@ -11,7 +11,6 @@ - - - -- - - - diff --git a/gnome-applets-notify.patch b/gnome-applets-notify.patch deleted file mode 100644 index e8514e2..0000000 --- a/gnome-applets-notify.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up gnome-applets-2.32.0/gweather/gweather-applet.c.notify gnome-applets-2.32.0/gweather/gweather-applet.c ---- gnome-applets-2.32.0/gweather/gweather-applet.c.notify 2010-11-03 16:59:56.081241996 -0400 -+++ gnome-applets-2.32.0/gweather/gweather-applet.c 2010-11-03 17:00:04.367241996 -0400 -@@ -471,8 +471,7 @@ update_finish (WeatherInfo *info, gpoint - if (icon == NULL) - icon = "stock-unknown"; - -- n = notify_notification_new (message, detail, icon, -- gw_applet->container); -+ n = notify_notification_new (message, detail, icon); - - notify_notification_show (n, &error); - if (error) diff --git a/gnome-applets-null-battstat.patch b/gnome-applets-null-battstat.patch deleted file mode 100644 index 760bc1c..0000000 --- a/gnome-applets-null-battstat.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -up gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in.battstat-null gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in ---- gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in.battstat-null 2010-03-28 23:21:03.987012192 -0400 -+++ gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in 2010-03-28 23:21:03.988012052 -0400 -@@ -0,0 +1,22 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff -up gnome-applets-2.30.0/null_applet/Makefile.am.battstat-null gnome-applets-2.30.0/null_applet/Makefile.am ---- gnome-applets-2.30.0/null_applet/Makefile.am.battstat-null 2010-03-28 01:29:51.000000000 -0400 -+++ gnome-applets-2.30.0/null_applet/Makefile.am 2010-03-28 23:23:29.771762645 -0400 -@@ -8,6 +8,10 @@ if !BUILD_MIXER_APPLET - mixer_server_in = GNOME_MixerApplet.server.in - endif - -+if !BUILD_BATTSTAT_APPLET -+battstat_applet=GNOME_BattstatApplet.server.in -+endif -+ - libexec_PROGRAMS = null_applet - - null_applet_SOURCES = null_applet.c -@@ -21,6 +25,7 @@ server_in_files = \ - GNOME_MailcheckApplet_Factory.server.in \ - GNOME_Panel_WirelessApplet.server.in \ - GNOME_KeyboardApplet.server.in \ -+ $(battstat_applet) \ - $(mixer_server_in) - server_DATA = $(server_in_files:.server.in=.server) - -@@ -39,6 +44,7 @@ EXTRA_DIST = \ - GNOME_MailcheckApplet_Factory.server.in \ - GNOME_Panel_WirelessApplet.server.in \ - GNOME_MixerApplet.server.in \ -+ GNOME_BattstatApplet.server.in \ - GNOME_KeyboardApplet.server.in - - -include $(top_srcdir)/git.mk -diff -up gnome-applets-2.30.0/null_applet/null_applet.c.battstat-null gnome-applets-2.30.0/null_applet/null_applet.c ---- gnome-applets-2.30.0/null_applet/null_applet.c.battstat-null 2010-03-28 01:29:51.000000000 -0400 -+++ gnome-applets-2.30.0/null_applet/null_applet.c 2010-03-28 23:24:15.766774031 -0400 -@@ -46,6 +46,8 @@ insert_oafiids (GHashTable *hash_table) - "OAFIID:GNOME_MixerApplet", _("Volume Control")); - g_hash_table_insert (hash_table, - "OAFIID:GNOME_KeyboardApplet", _("Keyboard Indicator")); -+ g_hash_table_insert (hash_table, -+ "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor"); - } - - static gboolean already_running; diff --git a/gnome-applets.spec b/gnome-applets.spec index db528f2..c772cee 100644 --- a/gnome-applets.spec +++ b/gnome-applets.spec @@ -33,60 +33,28 @@ Summary: Small applications for the GNOME panel Name: gnome-applets -Version: 3.1.2 -Release: 2%{?dist} +Version: 3.1.3 +Release: 1%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: User Interface/Desktops URL: http://www.gnome.org/ # VCS: git:git://git.gnome.org/gnome-applets -Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.xz -# Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2 - - -Patch3: gnome-applets-2.3.6-ppp-command.patch - -Patch34: ppp-includes.patch -Patch35: modemlights-libgnome.patch - -# do the nullapplet dance for battstat -Patch40: gnome-applets-null-battstat.patch -# and keep the mixer hidden away from the add to panel dialog -Patch41: gnome-applets-no-mixer-icon.patch -# do the nullapplet dance for stickynotes -Patch42: stickynotes-null.patch - -# https://bugzilla.gnome.org/show_bug.cgi?id=609945 -Patch50: gnome-applets-libs.patch -Patch51: pymod-check.patch - -Patch52: gnome-applets-dbus-glib.patch -# https://bugzilla.gnome.org/show_bug.cgi?id=632803 -Patch53: gnome-applets-notify.patch +Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.xz BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk3-devel >= %{gtk3_version} -# BuildRequires: libgnomeui-devel >= %{libgnomeui_version} -# BuildRequires: libgnome-devel >= %{libgnome_version} BuildRequires: gnome-panel-devel >= %{gnome_panel_version} -# BuildRequires: libglade2-devel >= %{libglade_version} BuildRequires: libgtop2-devel >= %{libgtop2_version} BuildRequires: pango-devel >= %{pango_version} -# BuildRequires: gail-devel >= %{gail_version} BuildRequires: libxklavier-devel >= %{libxklavier_version} BuildRequires: gstreamer-devel >= %{gstreamer_version} BuildRequires: gstreamer-plugins-base-devel >= %{gstreamer_plugins_version} BuildRequires: gstreamer-plugins-good-devel >= %{gstreamer_plugins_good_version} BuildRequires: /usr/bin/automake -# BuildRequires: libbonoboui-devel >= %{libbonoboui_version} BuildRequires: libwnck3-devel >= %{libwnck_version} -# BuildRequires: gnome-desktop3-devel >= %{libgnome_desktop_version} -# BuildRequires: gnome-utils >= %{gnome_utils_version} BuildRequires: libnotify-devel >= %{libnotify_version} BuildRequires: pygobject2-devel >= %{pygobject_version} -# BuildRequires: pygtk2-devel >= %{pygtk_version} -# BuildRequires: gnome-python2-devel >= %{gnome_python_version} -# BuildRequires: gnome-python2-applet BuildRequires: gucharmap-devel BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -96,13 +64,11 @@ BuildRequires: which BuildRequires: libtool autoconf gettext intltool BuildRequires: pkgconfig BuildRequires: gnome-icon-theme -# BuildRequires: libgnomekbd-devel >= %{libgnomekbd_version} BuildRequires: libxslt -# for patch 39 BuildRequires: NetworkManager-devel BuildRequires: libgweather-devel >= %{libgweather_version} # For cpufreq -BuildRequires: dbus-devel +BuildRequires: dbus-devel BuildRequires: polkit-devel >= 0.92 BuildRequires: scrollkeeper BuildRequires: libSM-devel @@ -118,10 +84,6 @@ Requires(pre): GConf2 >= %{gconf_version} Requires(preun): GConf2 >= %{gconf_version} Requires(post): GConf2 >= %{gconf_version} -# For invest-applet -# Requires: gnome-python2-applet -# Requires: gnome-python2-libegg - Obsoletes: battstat_applet Obsoletes: gnome-cpufreq-applet @@ -137,26 +99,6 @@ and more. %prep %setup -q -# TODO: port these three to new infrastructure -# %patch40 -p1 -b .battstat-null -# %patch41 -p1 -b .no-mixer-icon -# %patch42 -p1 -b .stickynotes-null - -# We don't ship gnome-system-tools -# rm -rf modemlights -# tar xjf %{SOURCE2} - -# %patch3 -p1 -b .ppp-command -# %patch34 -p1 -b .ppp-includes -# %patch35 -p1 -b .modemlights-libgnome -# %patch50 -p1 -b .libs -# %patch51 -p1 -b .pymod -# %patch52 -p1 -b .dbus-glib -# %patch53 -p1 -b .notify - -# autoreconf -i -f - - %build %configure \ --enable-suid=no \ @@ -324,6 +266,9 @@ fi %changelog +* Mon Jul 04 2011 Bastien Nocera 3.1.3-1 +- Update to 3.1.3 + * Tue Jun 14 2011 Tomas Bzatek - 1:3.1.2-1 - Update to 3.1.2 diff --git a/modemlights-libgnome.patch b/modemlights-libgnome.patch deleted file mode 100644 index 956ed67..0000000 --- a/modemlights-libgnome.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -up gnome-applets-2.31.91/configure.in.modemlights-libgnome gnome-applets-2.31.91/configure.in ---- gnome-applets-2.31.91/configure.in.modemlights-libgnome 2010-08-30 06:11:48.000000000 -0400 -+++ gnome-applets-2.31.91/configure.in 2010-09-01 10:16:20.595940001 -0400 -@@ -126,6 +126,11 @@ PKG_CHECK_MODULES(GNOME_APPLETS3, libpan - AC_SUBST(GNOME_APPLETS3_CFLAGS) - AC_SUBST(GNOME_APPLETS3_LIBS) - -+dnl -- check for libgnome (required) ------------------------------------------ -+PKG_CHECK_MODULES(GNOME_LIBS2, libgnome-2.0 libgnomeui-2.0) -+AC_SUBST(GNOME_LIBS2_CFLAGS) -+AC_SUBST(GNOME_LIBS2_LIBS) -+ - dnl -- check for gnome-desktop (required) ------------------------------------- - PKG_CHECK_MODULES(GNOMEDESKTOP, gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) - AC_SUBST(GNOMEDESKTOP_CFLAGS) -@@ -495,8 +500,7 @@ dnl AC_DEFINE_UNQUOTED(STB_SCRIPTS_DIR - dnl AC_DEFINE_UNQUOTED(SU_PATH, "${SU_TOOL}", [su executable path]) - dnl BUILD_MODEM_LIGHTS=yes - dnl else -- AC_MSG_WARN([*** modemlights applet will not be built ***]) -- BUILD_MODEM_LIGHTS=no -+ BUILD_MODEM_LIGHTS=yes - dnl fi - - AM_CONDITIONAL(APPLET_MODEMLIGHTS, test "x$BUILD_MODEM_LIGHTS" = "xyes") -@@ -688,6 +692,9 @@ mini-commander/help/Makefile - drivemount/Makefile - drivemount/help/Makefile - modemlights/Makefile -+modemlights/docs/Makefile -+modemlights/docs/C/Makefile -+modemlights/docs/eu/Makefile - multiload/Makefile - multiload/docs/Makefile - gkb-new/Makefile -diff -up gnome-applets-2.31.91/modemlights/Makefile.am.modemlights-libgnome gnome-applets-2.31.91/modemlights/Makefile.am ---- gnome-applets-2.31.91/modemlights/Makefile.am.modemlights-libgnome 2004-11-04 06:44:55.000000000 -0500 -+++ gnome-applets-2.31.91/modemlights/Makefile.am 2010-09-01 10:10:27.119940001 -0400 -@@ -2,6 +2,7 @@ SUBDIRS = docs - - INCLUDES = -I. -I$(srcdir) \ - $(GNOME_APPLETS_CFLAGS) \ -+ $(GNOME_LIBS2_CFLAGS) \ - -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - -DVERSION=\""$(VERSION)"\" - -@@ -13,6 +14,7 @@ modemlights_applet2_SOURCES = \ - properties.c - - modemlights_applet2_LDADD = \ -+ $(GNOME_LIBS2_LIBS) \ - $(GNOME_APPLETS_LIBS) - - uidir = $(datadir)/gnome-2.0/ui -diff -up gnome-applets-2.31.91/po/POTFILES.in.modemlights-libgnome gnome-applets-2.31.91/po/POTFILES.in ---- gnome-applets-2.31.91/po/POTFILES.in.modemlights-libgnome 2010-08-30 06:11:15.000000000 -0400 -+++ gnome-applets-2.31.91/po/POTFILES.in 2010-09-01 10:10:27.181940002 -0400 -@@ -72,7 +72,7 @@ mixer/applet.c - mixer/dock.c - mixer/load.c - mixer/mixer.schemas.in --mixer/org.gnome.applets.MixerApplet.panel-applet.in.in -+[type: gettext/ini]mixer/org.gnome.applets.MixerApplet.panel-applet.in.in - mixer/preferences.c - modemlights/modem-applet.c - [type: gettext/glade]modemlights/modemlights.ui diff --git a/ppp-includes.patch b/ppp-includes.patch deleted file mode 100644 index a3056c8..0000000 --- a/ppp-includes.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gnome-applets-2.19.0/modemlights/modemlights.c.includes gnome-applets-2.19.0/modemlights/modemlights.c ---- gnome-applets-2.19.0/modemlights/modemlights.c.includes 2007-07-30 18:05:02.000000000 -0400 -+++ gnome-applets-2.19.0/modemlights/modemlights.c 2007-07-30 18:05:13.000000000 -0400 -@@ -41,6 +41,8 @@ - #endif - - #ifdef __linux__ -+#define aligned_u64 unsigned long long __attribute__((aligned(8))) -+#include - #include - #include - #include diff --git a/pymod-check.patch b/pymod-check.patch deleted file mode 100644 index 26721f2..0000000 --- a/pymod-check.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up gnome-applets-2.31.91/m4/python.m4.pymod gnome-applets-2.31.91/m4/python.m4 ---- gnome-applets-2.31.91/m4/python.m4.pymod 2010-09-01 11:45:44.141940000 -0400 -+++ gnome-applets-2.31.91/m4/python.m4 2010-09-01 11:45:59.292940002 -0400 -@@ -14,6 +14,7 @@ except ImportError: - sys.exit(1) - except: - sys.exit(0) -+ - sys.exit(0)"], [prog=" - import $1 - $1.$2"]) -diff -up gnome-applets-2.31.91/configure.in.gnomeapplet gnome-applets-2.31.91/configure.in ---- gnome-applets-2.31.91/configure.in.gnomeapplet 2010-09-01 13:40:56.170939997 -0400 -+++ gnome-applets-2.31.91/configure.in 2010-09-01 13:44:44.248940002 -0400 -@@ -564,8 +564,7 @@ dnl *** invest-applet specific checks - dnl *************************************************************************** - - if test "x$HAVE_PYGTK" = "xyes" -a "x$HAVE_PYHDRS" = "xyes"; then -- AM_CHECK_PYMOD(gnomeapplet,, -- BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no") -+ BUILD_INVEST_APPLET="yes" - else - BUILD_INVEST_APPLET="no" - fi diff --git a/seriesid-clash.patch b/seriesid-clash.patch deleted file mode 100644 index 0dd346d..0000000 --- a/seriesid-clash.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in.seriesid gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in ---- gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in.seriesid 2009-10-27 00:25:35.351806142 -0400 -+++ gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in 2009-10-27 00:29:15.578549690 -0400 -@@ -3,7 +3,7 @@ - - - user's guide -- -+ - - - diff --git a/sources b/sources index 760ff50..7b3c06a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -40378b28964eff66ed5db18444b5e5da gnome-applets-3.1.2.tar.xz +909e59e8b991c44e9c10c2ce8bd28103 gnome-applets-3.1.3.tar.xz diff --git a/stickynotes-null.patch b/stickynotes-null.patch deleted file mode 100644 index 810d874..0000000 --- a/stickynotes-null.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -up gnome-applets-2.30.0/Makefile.am.stickynotes-null gnome-applets-2.30.0/Makefile.am ---- gnome-applets-2.30.0/Makefile.am.stickynotes-null 2010-03-28 01:29:51.000000000 -0400 -+++ gnome-applets-2.30.0/Makefile.am 2010-03-28 23:24:47.360759295 -0400 -@@ -42,7 +42,6 @@ always_built_SUBDIRS = \ - geyes \ - mini-commander \ - gkb-new \ -- stickynotes \ - trashapplet \ - null_applet - -diff -up gnome-applets-2.30.0/null_applet/GNOME_StickyNotesApplet.server.in.stickynotes-null gnome-applets-2.30.0/null_applet/GNOME_StickyNotesApplet.server.in ---- gnome-applets-2.30.0/null_applet/GNOME_StickyNotesApplet.server.in.stickynotes-null 2010-03-28 23:24:47.362759364 -0400 -+++ gnome-applets-2.30.0/null_applet/GNOME_StickyNotesApplet.server.in 2010-03-28 23:24:47.363762926 -0400 -@@ -0,0 +1,17 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff -up gnome-applets-2.30.0/null_applet/Makefile.am.stickynotes-null gnome-applets-2.30.0/null_applet/Makefile.am ---- gnome-applets-2.30.0/null_applet/Makefile.am.stickynotes-null 2010-03-28 23:24:47.000000000 -0400 -+++ gnome-applets-2.30.0/null_applet/Makefile.am 2010-03-28 23:26:45.638021343 -0400 -@@ -25,6 +25,7 @@ server_in_files = \ - GNOME_MailcheckApplet_Factory.server.in \ - GNOME_Panel_WirelessApplet.server.in \ - GNOME_KeyboardApplet.server.in \ -+ GNOME_StickyNotesApplet.server.in \ - $(battstat_applet) \ - $(mixer_server_in) - server_DATA = $(server_in_files:.server.in=.server) -@@ -44,6 +45,7 @@ EXTRA_DIST = \ - GNOME_MailcheckApplet_Factory.server.in \ - GNOME_Panel_WirelessApplet.server.in \ - GNOME_MixerApplet.server.in \ -+ GNOME_StickyNotesApplet.server.in \ - GNOME_BattstatApplet.server.in \ - GNOME_KeyboardApplet.server.in - -diff -up gnome-applets-2.30.0/null_applet/null_applet.c.stickynotes-null gnome-applets-2.30.0/null_applet/null_applet.c ---- gnome-applets-2.30.0/null_applet/null_applet.c.stickynotes-null 2010-03-28 23:24:47.000000000 -0400 -+++ gnome-applets-2.30.0/null_applet/null_applet.c 2010-03-28 23:27:18.451011564 -0400 -@@ -47,7 +47,9 @@ insert_oafiids (GHashTable *hash_table) - g_hash_table_insert (hash_table, - "OAFIID:GNOME_KeyboardApplet", _("Keyboard Indicator")); - g_hash_table_insert (hash_table, -- "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor"); -+ "OAFIID:GNOME_BattstatApplet", _("Battery Charge Monitor")); -+ g_hash_table_insert (hash_table, -+ "OAFIID:GNOME_StickyNotesApplet", _("Sticky Notes")); - } - - static gboolean already_running; -- cgit