Author: wiget Date: Wed Mar 28 15:43:22 2012 GMT Module: packages Tag: HEAD ---- Log message: - up to 0.135 - fix compilation with glib2 2.32 - rel. 1
---- Files affected: packages/pan: pan.spec (1.91 -> 1.92) , glib.patch (NONE -> 1.1) (NEW), gcc44.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/pan/pan.spec diff -u packages/pan/pan.spec:1.91 packages/pan/pan.spec:1.92 --- packages/pan/pan.spec:1.91 Wed Mar 28 14:16:50 2012 +++ packages/pan/pan.spec Wed Mar 28 17:43:17 2012 @@ -1,5 +1,7 @@ # $Revision$, $Date$ # +# TODO: consider gtk3 version +# # Conditional build: %bcond_without gtkspell # no spelling checker @@ -8,24 +10,24 @@ Summary(pl.UTF-8): Czytnik USENET dla GNOME Summary(pt_BR.UTF-8): Um leitor USENET para o GNOME Name: pan -Version: 0.133 -Release: 4 +Version: 0.135 +Release: 1 Epoch: 1 License: GPL v2 Group: Applications/News Source0: http://pan.rebelbase.com/download/releases/%{version}/source/%{name}-%{version}.tar.bz2 -# Source0-md5: ca165da8557605d89d327cff78891b89 +# Source0-md5: 0dc527d4abd663eaebcf39bf4ad0116e Patch0: %{name}-desktop.patch -Patch1: gcc44.patch +Patch1: glib.patch URL: http://pan.rebelbase.com/ BuildRequires: autoconf >= 2.54 BuildRequires: automake BuildRequires: gettext-devel -BuildRequires: gmime22-devel >= 2.2.0 -BuildRequires: gtk+2-devel >= 2:2.4.0 +BuildRequires: gmime-devel >= 2.4.0 +BuildRequires: gtk+2-devel >= 2:2.16.0 +BuildRequires: glib2-devel >= 2.32.0 %{?with_gtkspell:BuildRequires: gtkspell-devel >= 2.0.7} -BuildRequires: intltool >= 0.23 -BuildRequires: pcre-devel >= 5.0 +BuildRequires: intltool >= 0.35.5 BuildRequires: pkgconfig BuildRequires: sed >= 4.0 # sr@Latn vs. sr@latin @@ -63,6 +65,7 @@ %{__autoheader} %{__automake} %configure \ + --disable-silent-rules \ --with%{!?with_gtkspell:out}-gtkspell %{__make} @@ -91,6 +94,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.92 2012/03/28 15:43:17 wiget +- up to 0.135 +- fix compilation with glib2 2.32 +- rel. 1 + Revision 1.91 2012/03/28 12:16:50 arekm - release 4 ================================================================ Index: packages/pan/glib.patch diff -u /dev/null packages/pan/glib.patch:1.1 --- /dev/null Wed Mar 28 17:43:22 2012 +++ packages/pan/glib.patch Wed Mar 28 17:43:17 2012 @@ -0,0 +1,155 @@ +--- pan-0.135/pan/data/article-cache.h.wiget 2012-03-28 16:36:00.865446943 +0200 ++++ pan-0.135/pan/data/article-cache.h 2012-03-28 16:36:11.965446761 +0200 +@@ -23,7 +23,7 @@ + #include <map> + #include <vector> + extern "C" { +- #include <glib/gtypes.h> // for guint64 ++ #include <glib.h> // for guint64 + } + #include <pan/general/string-view.h> + #include <pan/general/quark.h> +--- pan-0.135/pan/gui/render-bytes.h.wiget 2012-03-28 16:47:59.698768400 +0200 ++++ pan-0.135/pan/gui/render-bytes.h 2012-03-28 16:48:06.468768293 +0200 +@@ -1,6 +1,6 @@ + #ifndef RENDER_BYTES_H + #define RENDER_BYTES_H +-#include <glib/gtypes.h> ++#include <glib.h> + namespace pan { + extern char* render_bytes (guint64); + } +--- pan-0.135/pan/gui/render-bytes.cc.wiget 2012-03-28 16:48:49.435434248 +0200 ++++ pan-0.135/pan/gui/render-bytes.cc 2012-03-28 16:48:55.735434144 +0200 +@@ -1,4 +1,4 @@ +-#include <glib/gutils.h> // g_snprintf ++#include <glib.h> // g_snprintf + #include "render-bytes.h" + + namespace pan +--- pan-0.135/pan/usenet-utils/text-massager.cc.wiget 2012-03-28 16:35:20.408780962 +0200 ++++ pan-0.135/pan/usenet-utils/text-massager.cc 2012-03-28 16:35:30.545447443 +0200 +@@ -25,7 +25,6 @@ + extern "C" { + #include <glib/gi18n.h> + } +-#include <glib/gunicode.h> + #include "text-massager.h" + #include <pan/general/log.h> + using namespace pan; +--- pan-0.135/pan/usenet-utils/mime-utils.h.wiget 2012-03-28 16:34:54.958781367 +0200 ++++ pan-0.135/pan/usenet-utils/mime-utils.h 2012-03-28 16:35:05.508781190 +0200 +@@ -21,7 +21,7 @@ + #define _UtilMime_h_ + + #include <vector> +-#include <glib/gtypes.h> ++#include <glib.h> + #include <gmime/gmime-filter.h> + #include <gmime/gmime-stream.h> + #include <gmime/gmime-message.h> +--- pan-0.135/pan/tasks/socket-impl-gio.h.wiget 2012-03-28 16:44:49.312104882 +0200 ++++ pan-0.135/pan/tasks/socket-impl-gio.h 2012-03-28 16:45:02.705437993 +0200 +@@ -21,8 +21,7 @@ + #define __SocketGIO_h__ + + #include <string> +-#include <glib/giochannel.h> +-#include <glib/gstring.h> ++#include <glib.h> + #include <pan/tasks/socket.h> + + namespace pan +--- pan-0.135/pan/data-impl/data-impl.cc.wiget 2012-03-28 16:46:13.082103498 +0200 ++++ pan-0.135/pan/data-impl/data-impl.cc 2012-03-28 16:46:30.828769877 +0200 +@@ -23,8 +23,8 @@ + + #include <config.h> + extern "C" { ++ #include <glib.h> // for g_build_filename + #include <glib/gi18n.h> +- #include <glib/gfileutils.h> // for g_build_filename + } + #include <pan/general/debug.h> + #include <pan/general/file-util.h> +--- pan-0.135/pan/general/locking.h.wiget 2012-03-28 16:43:57.605439071 +0200 ++++ pan-0.135/pan/general/locking.h 2012-03-28 16:44:09.972105531 +0200 +@@ -22,7 +22,7 @@ + #ifndef _Mutex_h_ + #define _Mutex_h_ + +-#include <glib/gthread.h> ++#include <glib.h> + + namespace pan + { +--- pan-0.135/pan/general/time-elapsed.h.wiget 2012-03-28 16:45:28.125437573 +0200 ++++ pan-0.135/pan/general/time-elapsed.h 2012-03-28 16:45:51.128770527 +0200 +@@ -1,9 +1,7 @@ + #ifndef __Time_Elapsed_h__ + #define __Time_Elapsed_h__ + +-#include <glib/gtypes.h> // for GTimeVal +-#include <glib/gmain.h> // for g_get_current_time +-#include <glib/gtimer.h> // for GUSEC_PER_SEC ++#include <glib.h> // for GTimeVal, g_get_current_time, GUSEC_PER_SEC + + namespace pan + { +--- pan-0.135/pan/general/worker-pool.cc.wiget 2012-03-28 16:33:56.295448998 +0200 ++++ pan-0.135/pan/general/worker-pool.cc 2012-03-28 16:34:07.975448807 +0200 +@@ -21,7 +21,7 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #include <cassert> +-#include <glib/gmain.h> // for g_idle_add ++#include <glib.h> // for g_idle_add + #include <pan/general/debug.h> + #include <pan/general/macros.h> + #include "worker-pool.h" +--- pan-0.135/pan/general/macros.h.wiget 2012-03-28 16:31:12.882118368 +0200 ++++ pan-0.135/pan/general/macros.h 2012-03-28 16:41:00.385441993 +0200 +@@ -62,15 +62,17 @@ + + extern "C" + { +- #include <glibconfig.h> // get the version +- #include <glib/gutils.h> // get GLIB_CHECK_VERSION ++ #include <glib.h> // get GLIB_CHECK_VERSION + + // pick up g_assert() ++ #if GLIB_CHECK_VERSION(2,32,0) ++ #else + #if GLIB_CHECK_VERSION(2,16,0) + #include <glib/gtestutils.h> + #else + #include <glib/gmessages.h> + #endif ++ #endif + } + + #endif +--- pan-0.135/pan/general/worker-pool.h.wiget 2012-03-28 16:34:19.788781942 +0200 ++++ pan-0.135/pan/general/worker-pool.h 2012-03-28 16:34:30.955448432 +0200 +@@ -24,8 +24,7 @@ + #define _Worker_Pool_H_ + + #include <set> +-#include <glib/gtypes.h> +-#include <glib/gthreadpool.h> ++#include <glib.h> + + namespace pan + { +--- pan-0.135/pan/general/file-util.h.wiget 2012-03-28 16:29:24.142120163 +0200 ++++ pan-0.135/pan/general/file-util.h 2012-03-28 16:29:37.668786607 +0200 +@@ -25,8 +25,7 @@ + extern "C" { + #include <stddef.h> + #include <stdio.h> +- #include <glib/gtypes.h> +- #include <glib/gstdio.h> ++ #include <glib.h> + } + #include <pan/general/string-view.h> + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/pan/pan.spec?r1=1.91&r2=1.92 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
