rpms/jd/F-7 jd-2.0.0-svn1774_trunk-gcc43.patch, NONE, 1.1 .cvsignore, 1.170, 1.171 jd.spec, 1.195, 1.196 sources, 1.171, 1.172

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19382/F-7

Modified Files:
	.cvsignore jd.spec sources 
Added Files:
	jd-2.0.0-svn1774_trunk-gcc43.patch 
Log Message:
* Fri Feb  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.2.svn1775
- svn 1775 (version 2.0.0)


jd-2.0.0-svn1774_trunk-gcc43.patch:

--- NEW FILE jd-2.0.0-svn1774_trunk-gcc43.patch ---
--- 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 <sstream>
+#include <cstring>
 
 #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 <sys/time.h>
+#include <cstring>
 
 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 <math.h>
 #include <sstream>
+#include <cstring>
 
 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 <cstdlib>
+#include <cstring>
+
 
 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 <cstring>
+
 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 <sstream>
+#include <cstring>
 
 #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 <sstream>
+#include <cstring>
 
 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 <sstream>
+#include <cstring>
 
 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 <sstream>
+#include <cstring>
 
 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 <sstream>
+#include <cstring>
 
 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 <cstring>
+
 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 <sstream>
+#include <cstring>
 
 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 <list>
 #include <vector>
+#include <string>
 
 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 <cstdlib>
+
 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 <cstdlib>
+#include <cstring>
+
 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 <errno.h>
+#include <cstring>
+#include <cstdlib>
 
 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 <stdlib.h>
 #include <string>
+#include <cstring>
 
 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 <limits.h>
+#include <cstring>
 
 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 <sstream>
+#include <cstring>
 
 #include <errno.h>
 #include <fcntl.h>
--- 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 <cstring>
+
 
 // チェックする最大バイト数
 #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 <sstream>
+#include <cstring>
 #include <time.h>
 #include <sys/time.h>
 
-
 //
 // 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 <string>
+#include <sys/time.h>
 
 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 <sstream>
+#include <cstring>
+#include <cstdlib>
 
 
 //
--- 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 <cstring>
+
 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 <string>
 #include <sys/time.h>
 #include <errno.h>
+#include <cstring>
 
 #ifdef USE_GNOMEUI
 #include <gnome.h>
--- 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 <sstream>
 #include <sys/time.h>
+#include <cstring>
 
 
 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 <cstring>
+
 
 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 <sstream>
+#include <cstring>
 
 #ifdef HAVE_SYS_UTSNAME_H
 #include <sys/utsname.h> // 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 <list>
 #include <vector>
+#include <string>
 
 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 <sstream>
+#include <cstring>
 #include <sys/types.h> // chmod
 #include <sys/stat.h>
 
--- 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 <cstring>
+
 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 <algorithm>
+
 CORE::CheckUpdate_Manager* instance_checkupdate_manager = NULL;
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/.cvsignore,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- .cvsignore	6 Feb 2008 17:29:18 -0000	1.170
+++ .cvsignore	7 Feb 2008 15:54:07 -0000	1.171
@@ -1,3 +1,3 @@
 jd-1.9.8-svn1747_jd1.tgz
 jd-2.0.0-svn1763_jdsksy.tgz
-jd-2.0.0-svn1770_trunk.tgz
+jd-2.0.0-svn1775_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/jd.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- jd.spec	6 Feb 2008 17:29:18 -0000	1.195
+++ jd.spec	7 Feb 2008 15:54:07 -0000	1.196
@@ -22,7 +22,7 @@
 
 %if             %use_trunk
 %define         main_ver      2.0.0
-%define         strtag        svn1770_trunk
+%define         strtag        svn1775_trunk
 %define         _pre_release  1
 %endif
 
@@ -40,7 +40,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    3
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -76,6 +76,7 @@
 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-2.0.0-svn1774_trunk-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -97,8 +98,20 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
+%patch0 -p1 -b .gcc43
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
+# Workarround for bug 431017
+# https://bugs.gentoo.org/show_bug.cgi?id=203931
+# http://bugzilla.gnome.org/show_bug.cgi?id=454882
+%if 0%{?fedora} >= 9
+%{__mkdir} INCLUDE
+sed -e \
+	'/SIGC_TYPEDEF_REDEFINE_ALLOWED/s|#define\(.*\)1|#undef\1|' \
+	%{_libdir}/sigc++-2.0/include/sigc++config.h \
+	> INCLUDE/sigc++config.h
+%endif
+
 %build
 sh autogen.sh
 
@@ -111,7 +124,11 @@
    --with-migemodict=%{migemo_dict}
 %endif
 
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} \
+%if 0%{?fedora} >= 9
+	CXX="%{__cxx} -I$(pwd)/INCLUDE/" 
+%endif
+
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -146,8 +163,12 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Thu Feb  7 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.2.svn1770
-- svn 1770 (version 2.0.0)
+* Fri Feb  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.2.svn1775
+- svn 1775 (version 2.0.0)
+
+* Fri Feb  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.2.svn1774
+- Patch to make jd happy with gcc43
+- Workarround for libsigc++ side bug (bug 431017)
 
 * Fri Dec 28 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.8-1
 - 1.9.8


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-7/sources,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- sources	6 Feb 2008 17:29:18 -0000	1.171
+++ sources	7 Feb 2008 15:54:07 -0000	1.172
@@ -1,3 +1,3 @@
 c768cb816bdc327bbd9acfec6a6e2048  jd-1.9.8-svn1747_jd1.tgz
 e0de8ba3fde4a2f4ccf989f8b4842076  jd-2.0.0-svn1763_jdsksy.tgz
-a06a3df3202cc49170f987fc109197f9  jd-2.0.0-svn1770_trunk.tgz
+93bf7ef55ffcceed2b29b37ef9aa481b  jd-2.0.0-svn1775_trunk.tgz