diff --git a/.cvsignore b/.cvsignore index d6d4909..76d1aa4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -jd-2.0.0-svn2102_trunk.tgz +jd-2.0.0-svn2112_trunk.tgz diff --git a/jd-2.0.0-svn1774_trunk-gcc43.patch b/jd-2.0.0-svn1774_trunk-gcc43.patch deleted file mode 100644 index 560a587..0000000 --- a/jd-2.0.0-svn1774_trunk-gcc43.patch +++ /dev/null @@ -1,338 +0,0 @@ ---- trunk-build/src/article/articleviewbase.cpp.gcc43 2008-02-05 01:26:39.000000000 +0900 -+++ trunk-build/src/article/articleviewbase.cpp 2008-02-07 23:17:05.000000000 +0900 -@@ -40,6 +40,7 @@ - #include "icons/iconmanager.h" - - #include -+#include - - #ifndef MAX - #define MAX( a, b ) ( a > b ? a : b ) ---- trunk-build/src/article/articleviewetc.cpp.gcc43 2008-02-05 01:26:39.000000000 +0900 -+++ trunk-build/src/article/articleviewetc.cpp 2008-02-07 23:18:30.000000000 +0900 -@@ -16,6 +16,7 @@ - #include "global.h" - - #include -+#include - - using namespace ARTICLE; - ---- trunk-build/src/article/drawareabase.cpp.gcc43 2008-01-10 00:50:12.000000000 +0900 -+++ trunk-build/src/article/drawareabase.cpp 2008-02-07 23:11:06.000000000 +0900 -@@ -34,6 +34,7 @@ - - #include - #include -+#include - - using namespace ARTICLE; - ---- trunk-build/src/article/font.cpp.gcc43 2007-12-03 21:02:28.000000000 +0900 -+++ trunk-build/src/article/font.cpp 2008-02-07 23:19:36.000000000 +0900 -@@ -10,6 +10,9 @@ - #include "fontid.h" - #include "config/globalconf.h" - -+#include -+#include -+ - - struct WIDTH_DATA - { ---- trunk-build/src/cssmanager.cpp.gcc43 2007-12-03 21:02:34.000000000 +0900 -+++ trunk-build/src/cssmanager.cpp 2008-02-07 23:45:43.000000000 +0900 -@@ -13,6 +13,8 @@ - #include "colorid.h" - #include "cache.h" - -+#include -+ - enum - { - SIZE_OF_HEAP = 16 * 1024 ---- trunk-build/src/dbimg/img.cpp.gcc43 2007-12-03 21:02:30.000000000 +0900 -+++ trunk-build/src/dbimg/img.cpp 2008-02-07 23:10:06.000000000 +0900 -@@ -20,6 +20,7 @@ - #include "session.h" - - #include -+#include - - #ifndef MAX - #define MAX( a, b ) ( a > b ? a : b ) ---- trunk-build/src/dbtree/board2chcompati.cpp.gcc43 2007-12-16 00:20:36.000000000 +0900 -+++ trunk-build/src/dbtree/board2chcompati.cpp 2008-02-07 23:04:33.000000000 +0900 -@@ -18,6 +18,7 @@ - #include "global.h" - - #include -+#include - - using namespace DBTREE; - ---- trunk-build/src/dbtree/boardbase.cpp.gcc43 2007-12-16 00:20:36.000000000 +0900 -+++ trunk-build/src/dbtree/boardbase.cpp 2008-02-07 23:03:41.000000000 +0900 -@@ -26,6 +26,7 @@ - #include "session.h" - - #include -+#include - - enum - { ---- trunk-build/src/dbtree/boardjbbs.cpp.gcc43 2007-12-16 00:20:36.000000000 +0900 -+++ trunk-build/src/dbtree/boardjbbs.cpp 2008-02-07 23:06:11.000000000 +0900 -@@ -13,6 +13,7 @@ - #include "global.h" - - #include -+#include - - using namespace DBTREE; - ---- trunk-build/src/dbtree/boardmachi.cpp.gcc43 2007-12-16 00:20:36.000000000 +0900 -+++ trunk-build/src/dbtree/boardmachi.cpp 2008-02-07 23:06:45.000000000 +0900 -@@ -13,6 +13,7 @@ - #include "global.h" - - #include -+#include - - using namespace DBTREE; - ---- trunk-build/src/dbtree/nodetreebase.h.gcc43 2007-09-04 00:45:49.000000000 +0900 -+++ trunk-build/src/dbtree/nodetreebase.h 2008-02-07 23:08:37.000000000 +0900 -@@ -13,6 +13,8 @@ - - #include "jdlib/heap.h" - -+#include -+ - namespace JDLIB - { - class LOADERDATA; ---- trunk-build/src/dbtree/root.cpp.gcc43 2007-12-03 21:02:29.000000000 +0900 -+++ trunk-build/src/dbtree/root.cpp 2008-02-07 23:02:18.000000000 +0900 -@@ -25,6 +25,7 @@ - #include "jdversion.h" - - #include -+#include - - enum - { ---- trunk-build/src/history/historymanager.h.gcc43 2008-01-25 00:29:49.000000000 +0900 -+++ trunk-build/src/history/historymanager.h 2008-02-07 23:42:20.000000000 +0900 -@@ -9,6 +9,7 @@ - - #include - #include -+#include - - namespace Gtk - { ---- trunk-build/src/jdlib/confloader.cpp.gcc43 2007-08-30 03:55:38.000000000 +0900 -+++ trunk-build/src/jdlib/confloader.cpp 2008-02-08 00:29:30.000000000 +0900 -@@ -7,6 +7,8 @@ - #include "miscutil.h" - #include "cache.h" - -+#include -+ - using namespace JDLIB; - - // ---- trunk-build/src/jdlib/heap.cpp.gcc43 2007-08-30 03:55:38.000000000 +0900 -+++ trunk-build/src/jdlib/heap.cpp 2008-02-08 00:27:21.000000000 +0900 -@@ -5,6 +5,9 @@ - - #include "heap.h" - -+#include -+#include -+ - using namespace JDLIB; - - HEAP::HEAP( long blocksize ) ---- trunk-build/src/jdlib/jdiconv.cpp.gcc43 2007-12-16 22:05:07.000000000 +0900 -+++ trunk-build/src/jdlib/jdiconv.cpp 2008-02-08 00:27:56.000000000 +0900 -@@ -11,6 +11,8 @@ - #include "miscmsg.h" - - #include -+#include -+#include - - using namespace JDLIB; - ---- trunk-build/src/jdlib/jdmigemo.cpp.gcc43 2007-08-30 03:55:38.000000000 +0900 -+++ trunk-build/src/jdlib/jdmigemo.cpp 2008-02-08 00:30:02.000000000 +0900 -@@ -19,6 +19,7 @@ - - #include - #include -+#include - - migemo *migemo_object; - ---- trunk-build/src/jdlib/jdthread.cpp.gcc43 2007-12-07 01:28:31.000000000 +0900 -+++ trunk-build/src/jdlib/jdthread.cpp 2008-02-08 00:24:47.000000000 +0900 -@@ -7,6 +7,7 @@ - #include "miscmsg.h" - - #include -+#include - - using namespace JDLIB; - ---- trunk-build/src/jdlib/loader.cpp.gcc43 2007-12-09 00:01:01.000000000 +0900 -+++ trunk-build/src/jdlib/loader.cpp 2008-02-08 00:28:46.000000000 +0900 -@@ -14,6 +14,7 @@ - #include "httpcode.h" - - #include -+#include - - #include - #include ---- trunk-build/src/jdlib/misccharcode.cpp.gcc43 2008-01-08 01:04:07.000000000 +0900 -+++ trunk-build/src/jdlib/misccharcode.cpp 2008-02-08 00:26:24.000000000 +0900 -@@ -5,6 +5,8 @@ - - #include "misccharcode.h" - -+#include -+ - - // チェックする最大バイト数 - #define CHECK_LIMIT 1024 ---- trunk-build/src/jdlib/misctime.cpp.gcc43 2007-08-30 03:55:38.000000000 +0900 -+++ trunk-build/src/jdlib/misctime.cpp 2008-02-08 00:19:31.000000000 +0900 -@@ -6,10 +6,10 @@ - #include "misctime.h" - - #include -+#include - #include - #include - -- - // - // gettimeofday()の秒を文字列で取得 - // ---- trunk-build/src/jdlib/misctime.h.gcc43 2007-08-30 03:55:38.000000000 +0900 -+++ trunk-build/src/jdlib/misctime.h 2008-02-08 00:22:31.000000000 +0900 -@@ -6,6 +6,7 @@ - #define _MISCTIME_H - - #include -+#include - - namespace MISC - { ---- trunk-build/src/jdlib/miscutil.cpp.gcc43 2008-01-08 01:04:07.000000000 +0900 -+++ trunk-build/src/jdlib/miscutil.cpp 2008-02-07 23:21:56.000000000 +0900 -@@ -11,6 +11,8 @@ - #include "dbtree/spchar_decoder.h" - - #include -+#include -+#include - - - // ---- trunk-build/src/login2ch.cpp.gcc43 2007-12-03 21:02:34.000000000 +0900 -+++ trunk-build/src/login2ch.cpp 2008-02-08 00:01:10.000000000 +0900 -@@ -16,6 +16,8 @@ - #include "jdlib/loaderdata.h" - #include "jdlib/miscmsg.h" - -+#include -+ - enum - { - SIZE_OF_RAWDATA = 64 * 1024 ---- trunk-build/src/main.cpp.gcc43 2008-02-07 22:38:49.000000000 +0900 -+++ trunk-build/src/main.cpp 2008-02-07 23:43:50.000000000 +0900 -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - #ifdef USE_GNOMEUI - #include ---- trunk-build/src/message/messageviewbase.cpp.gcc43 2008-02-05 01:26:40.000000000 +0900 -+++ trunk-build/src/message/messageviewbase.cpp 2008-02-07 23:20:15.000000000 +0900 -@@ -32,6 +32,7 @@ - - #include - #include -+#include - - - using namespace MESSAGE; ---- trunk-build/src/message/post.cpp.gcc43 2007-12-03 21:02:28.000000000 +0900 -+++ trunk-build/src/message/post.cpp 2008-02-07 23:20:51.000000000 +0900 -@@ -20,6 +20,8 @@ - - #include "httpcode.h" - -+#include -+ - - using namespace MESSAGE; - ---- trunk-build/src/session.cpp.gcc43 2008-02-05 01:26:41.000000000 +0900 -+++ trunk-build/src/session.cpp 2008-02-07 23:59:04.000000000 +0900 -@@ -18,6 +18,7 @@ - #include "article/articleadmin.h" - - #include -+#include - - #ifdef HAVE_SYS_UTSNAME_H - #include // uname() ---- trunk-build/src/session.h.gcc43 2008-01-25 00:29:49.000000000 +0900 -+++ trunk-build/src/session.h 2008-02-07 23:54:01.000000000 +0900 -@@ -8,6 +8,7 @@ - - #include - #include -+#include - - namespace SESSION - { ---- trunk-build/src/skeleton/login.cpp.gcc43 2007-08-30 03:55:39.000000000 +0900 -+++ trunk-build/src/skeleton/login.cpp 2008-02-07 23:39:02.000000000 +0900 -@@ -10,6 +10,7 @@ - #include "jdlib/confloader.h" - - #include -+#include - #include // chmod - #include - ---- trunk-build/src/skeleton/textloader.cpp.gcc43 2007-12-03 21:02:32.000000000 +0900 -+++ trunk-build/src/skeleton/textloader.cpp 2008-02-07 23:39:41.000000000 +0900 -@@ -13,6 +13,8 @@ - #include "session.h" - #include "cache.h" - -+#include -+ - enum - { - SIZE_OF_RAWDATA = 1024 * 1024 ---- trunk-build/src/updatemanager.cpp.gcc43 2007-08-30 03:55:39.000000000 +0900 -+++ trunk-build/src/updatemanager.cpp 2008-02-07 23:53:01.000000000 +0900 -@@ -12,6 +12,8 @@ - #include "command.h" - #include "global.h" - -+#include -+ - CORE::CheckUpdate_Manager* instance_checkupdate_manager = NULL; - - diff --git a/jd-2.0.0-svn1936_trunk-gcc43.patch b/jd-2.0.0-svn1936_trunk-gcc43.patch deleted file mode 100644 index 55af60d..0000000 --- a/jd-2.0.0-svn1936_trunk-gcc43.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- trunk-build-fix/src/controlutil.cpp.gcc43 2008-04-06 16:02:16.000000000 +0900 -+++ trunk-build-fix/src/controlutil.cpp 2008-04-06 16:24:08.000000000 +0900 -@@ -10,6 +10,7 @@ - #include "config/keyconfig.h" - #include "config/mouseconfig.h" - -+#include - - // メニューにショートカットキーやマウスジェスチャを表示 - void CONTROL::set_menu_motion( Gtk::Menu* menu ) diff --git a/jd-svn2112-compile.patch b/jd-svn2112-compile.patch new file mode 100644 index 0000000..92fa339 --- /dev/null +++ b/jd-svn2112-compile.patch @@ -0,0 +1,13 @@ +--- trunk-build/src/config/configitems.h.debug 2008-06-08 01:25:51.000000000 +0900 ++++ trunk-build/src/config/configitems.h 2008-06-08 02:14:59.000000000 +0900 +@@ -6,6 +6,10 @@ + #ifndef _CONFIGITEMS_H + #define _CONFIGITEMS_H + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + #include + #include diff --git a/jd.spec b/jd.spec index 81a721c..f50c705 100644 --- a/jd.spec +++ b/jd.spec @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 2.0.0 -%define strtag svn2102_trunk +%define strtag svn2112_trunk %define repoid 31373 # Define this if this is pre-version %define pre_release 1 @@ -44,7 +44,7 @@ Name: jd Version: %{main_ver} -Release: %{rel}.1 +Release: %{rel} Summary: A 2ch browser Group: Applications/Internet @@ -52,6 +52,7 @@ License: GPLv2 URL: http://jd4linux.sourceforge.jp/ Source0: http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz #Source0: %{name}-%{main_ver}-%{strtag}.tgz +Patch0: jd-svn2112-compile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{gtkmmdevel} @@ -74,9 +75,10 @@ JD is a 2ch browser based on gtkmm2. %prep %setup -q -n %{name}-%{main_ver}-%{strtag} +%patch0 -p1 -b .debug #find . -name .svn | sort -r | xargs %{__rm} -rf -%if 0%{?fedora} >= 10 && 0 +%if 0%{?fedora} >= 10 # Workarround for bug 449225 %{__mkdir_p} Tmp_include/giomm %{__sed} \ @@ -99,7 +101,7 @@ export TZ='Asia/Tokyo' %endif %{__make} %{?_smp_mflags} \ -%if 0%{?fedora} >= 10 && 0 +%if 0%{?fedora} >= 10 CXX="%{__cxx} -I$(pwd)/Tmp_include/" %endif @@ -137,8 +139,8 @@ touch --no-create %{_datadir}/icons/hicolor || : %{icondir}/%{name}.png %changelog -* Wed Jun 4 2008 Mamoru Tasaka -- svn 2102 +* Sun Jun 8 2008 Mamoru Tasaka +- svn 2112 * Mon Jun 2 2008 Mamoru Tasaka - 2.0.0-0.6.beta20080601 - 2.0.0 beta 20080601 diff --git a/sources b/sources index c0d2f80..87d7845 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -00809d706581bd11a438708f317fba9e jd-2.0.0-svn2102_trunk.tgz +dabc8bc49200b3e5a948813a6b7d3cc2 jd-2.0.0-svn2112_trunk.tgz