Hello community,
here is the log from the commit of package pan for openSUSE:Factory checked in at 2012-01-05 19:14:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pan (Old)
and /work/SRC/openSUSE:Factory/.pan.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pan", Maintainer is "drahn@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pan/pan.changes 2011-10-16 12:57:18.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.pan.new/pan.changes 2012-01-05 19:14:35.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Dec 1 13:59:30 UTC 2011 - dimstar@opensuse.org
+
+- Add pan-glib-2.31.patch: Fix build with glib 2.31.
+
+-------------------------------------------------------------------
New:
----
pan-glib-2.31.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pan.spec ++++++
--- /var/tmp/diff_new_pack.6bM8rE/_old 2012-01-05 19:14:36.000000000 +0100
+++ /var/tmp/diff_new_pack.6bM8rE/_new 2012-01-05 19:14:36.000000000 +0100
@@ -27,6 +27,8 @@
Source: http://pan.rebelbase.com/download/releases/0.134/source/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM fix-desktop-file-11.0.diff -- validate desktop file
Patch0: fix-desktop-file-11.0.diff
+# PATCH-FIX-UPSTREAM pan-glib-2.31.patch bgo#665289 dimstar@opensuse.org -- Fix build with glib 2.31
+Patch1: pan-glib-2.31.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: gnome-patch-translation
@@ -57,6 +59,7 @@
translation-update-upstream
gnome-patch-translation-prepare
%patch0
+%patch1 -p1
gnome-patch-translation-update
%build
++++++ pan-glib-2.31.patch ++++++
Index: pan-0.135/pan/data-impl/data-impl.cc
===================================================================
--- pan-0.135.orig/pan/data-impl/data-impl.cc
+++ pan-0.135/pan/data-impl/data-impl.cc
@@ -24,7 +24,7 @@
#include
extern "C" {
#include
- #include // for g_build_filename
+ #include // for g_build_filename
}
#include
#include
Index: pan-0.135/pan/data/article-cache.h
===================================================================
--- pan-0.135.orig/pan/data/article-cache.h
+++ pan-0.135/pan/data/article-cache.h
@@ -23,7 +23,7 @@
#include <map>
#include <vector>
extern "C" {
- #include // for guint64
+ #include // for guint64
}
#include
#include
Index: pan-0.135/pan/general/file-util.h
===================================================================
--- pan-0.135.orig/pan/general/file-util.h
+++ pan-0.135/pan/general/file-util.h
@@ -25,7 +25,7 @@
extern "C" {
#include
#include
- #include
+ #include
#include
}
#include
Index: pan-0.135/pan/general/locking.h
===================================================================
--- pan-0.135.orig/pan/general/locking.h
+++ pan-0.135/pan/general/locking.h
@@ -22,7 +22,7 @@
#ifndef _Mutex_h_
#define _Mutex_h_
-#include
+#include
namespace pan
{
Index: pan-0.135/pan/general/macros.h
===================================================================
--- pan-0.135.orig/pan/general/macros.h
+++ pan-0.135/pan/general/macros.h
@@ -62,12 +62,11 @@
extern "C"
{
- #include // get the version
- #include // get GLIB_CHECK_VERSION
+ #include
// pick up g_assert()
#if GLIB_CHECK_VERSION(2,16,0)
- #include
+ #include
#else
#include
#endif
Index: pan-0.135/pan/general/time-elapsed.h
===================================================================
--- pan-0.135.orig/pan/general/time-elapsed.h
+++ pan-0.135/pan/general/time-elapsed.h
@@ -1,9 +1,7 @@
#ifndef __Time_Elapsed_h__
#define __Time_Elapsed_h__
-#include // for GTimeVal
-#include // for g_get_current_time
-#include // for GUSEC_PER_SEC
+#include
namespace pan
{
Index: pan-0.135/pan/general/worker-pool.cc
===================================================================
--- pan-0.135.orig/pan/general/worker-pool.cc
+++ pan-0.135/pan/general/worker-pool.cc
@@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <cassert>
-#include // for g_idle_add
+#include // for g_idle_add
#include
#include
#include "worker-pool.h"
Index: pan-0.135/pan/general/worker-pool.h
===================================================================
--- pan-0.135.orig/pan/general/worker-pool.h
+++ pan-0.135/pan/general/worker-pool.h
@@ -24,8 +24,7 @@
#define _Worker_Pool_H_
#include <set>
-#include
-#include
+#include
namespace pan
{
Index: pan-0.135/pan/gui/render-bytes.cc
===================================================================
--- pan-0.135.orig/pan/gui/render-bytes.cc
+++ pan-0.135/pan/gui/render-bytes.cc
@@ -1,4 +1,4 @@
-#include // g_snprintf
+#include // g_snprintf
#include "render-bytes.h"
namespace pan
Index: pan-0.135/pan/gui/render-bytes.h
===================================================================
--- pan-0.135.orig/pan/gui/render-bytes.h
+++ pan-0.135/pan/gui/render-bytes.h
@@ -1,6 +1,6 @@
#ifndef RENDER_BYTES_H
#define RENDER_BYTES_H
-#include
+#include
namespace pan {
extern char* render_bytes (guint64);
}
Index: pan-0.135/pan/tasks/socket-impl-gio.h
===================================================================
--- pan-0.135.orig/pan/tasks/socket-impl-gio.h
+++ pan-0.135/pan/tasks/socket-impl-gio.h
@@ -21,8 +21,7 @@
#define __SocketGIO_h__
#include <string>
-#include
-#include
+#include
#include
namespace pan
Index: pan-0.135/pan/usenet-utils/mime-utils.h
===================================================================
--- pan-0.135.orig/pan/usenet-utils/mime-utils.h
+++ pan-0.135/pan/usenet-utils/mime-utils.h
@@ -21,7 +21,7 @@
#define _UtilMime_h_
#include <vector>
-#include
+#include
#include
#include
#include
Index: pan-0.135/pan/usenet-utils/text-massager.cc
===================================================================
--- pan-0.135.orig/pan/usenet-utils/text-massager.cc
+++ pan-0.135/pan/usenet-utils/text-massager.cc
@@ -25,7 +25,6 @@
extern "C" {
#include
}
-#include
#include "text-massager.h"
#include
using namespace pan;
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org