rpms/jd/devel jd-svn3361-DSO.patch,NONE,1.1 jd.spec,1.486,1.487

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20820

Modified Files:
	jd.spec 
Added Files:
	jd-svn3361-DSO.patch 
Log Message:
Add patch for DSO issue

jd-svn3361-DSO.patch:
 configure.in          |   14 ++++++++++++++
 src/Makefile.am       |    3 +++
 src/jdlib/Makefile.am |    3 +++
 3 files changed, 20 insertions(+)

--- NEW FILE jd-svn3361-DSO.patch ---
Index: configure.in
===================================================================
--- configure.in	(revision 3361)
+++ configure.in	(working copy)
@@ -159,7 +159,18 @@
 
 AM_CONDITIONAL(MAKE_WINDRES, test -n "$use_windres")
 
+dnl
+dnl X関連ライブラリ
+dnl
+X11_CFLAGS=""
+X11_LIBS=""
 
+if test -z "$use_windres" ; then
+PKG_CHECK_MODULES(X11, x11)
+AC_SUBST(X11_CFLAGS)
+AC_SUBST(X11_LIBS)
+fi
+
 dnl
 dnl セッション管理
 dnl
@@ -261,6 +272,9 @@
    echo "use gnutls"
    PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.2] )
    AC_DEFINE(USE_GNUTLS, , "use gnutls")
+   AC_CHECK_HEADERS([gcrypt.h])
+   AC_CHECK_LIB(gcrypt, gcry_md_hash_buffer, [GCRYPT_LIBS=-lgcrypt])
+   GNUTLS_LIBS="$GNUTLS_LIBS $GCRYPT_LIBS"
    AC_SUBST(GNUTLS_CFLAGS)
    AC_SUBST(GNUTLS_LIBS)
    ;;
Index: src/jdlib/Makefile.am
===================================================================
--- src/jdlib/Makefile.am	(revision 3361)
+++ src/jdlib/Makefile.am	(working copy)
@@ -46,4 +46,7 @@
 	timeout.h
 
 AM_CXXFLAGS = @GTKMM_CFLAGS@ @GNUTLS_CFLAGS@ @OPENSSL_CFLAGS@
+if ! MAKE_WINDRES
+AM_CXXFLAGS += @X11_CFLAGS@
+endif
 INCLUDES = -I$(top_srcdir)/src
Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(revision 3361)
+++ src/Makefile.am	(working copy)
@@ -20,6 +20,9 @@
 	./control/libcontrol.a \
 	@LIBS@ @GTKMM_LIBS@ @GTHREAD_LIBS@ @GNUTLS_LIBS@ @OPENSSL_LIBS@ @GNOMEUI_LIBS@ @LIBSM_LIBS@ @ALSA_LIBS@ @ONIG_LIBS@
 
+if ! MAKE_WINDRES
+jd_LDADD += @X11_LIBS@
+endif
 
 jd_SOURCES = \
 	main.cpp \


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -p -r1.486 -r1.487
--- jd.spec	11 Feb 2010 18:04:46 -0000	1.486
+++ jd.spec	12 Feb 2010 10:41:30 -0000	1.487
@@ -52,6 +52,7 @@ URL:            http://jd4linux.sourcefo
 Source0:        http://dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 Patch0:         jd-2.6.0-rc100130-env-pkg-distro-specific.patch
+Patch1:         jd-svn3361-DSO.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -82,6 +83,7 @@ JD is a 2ch browser based on gtkmm2.
 # Fedora specific
 if ( uname -n | grep -q 'fedoraproject\.org' ) ; then
 %patch0 -p1 -b .env_fedora
+%patch1 -p0 -b .dso
 fi
 
 sh autogen.sh