rpms/jd/devel jd-rev2575-oniguruma.patch, NONE, 1.1 jd.spec, 1.373, 1.374

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	jd.spec 
Added Files:
	jd-rev2575-oniguruma.patch 
Log Message:
Trial oniguruma support, currently being discussed upstream

jd-rev2575-oniguruma.patch:

--- NEW FILE jd-rev2575-oniguruma.patch ---
Index: configure.in
===================================================================
--- configure.in	(revision 2575)
+++ configure.in	(working copy)
@@ -296,7 +296,29 @@
  ;;
 esac
 
+
 dnl
+dnl checking oniguruma
+dnl
+AC_ARG_WITH(oniguruma,[ --with-oniguruma    (enable oniguruma)],
+       [ if test "$withval" != "no" ;then
+               echo "use oniguruma"
+               AC_CHECK_PROG(ONIG_CONFIG, onig-config, onig-config)
+               if test "x${ONIG_CONFIG}" == "x" ; then
+                 AC_MSG_ERROR([onig-config not found])
+               fi
+               ONIG_CFLAGS=$(onig-config --cflags)
+               ONIG_LIBS=$(onig-config --libs)
+               AC_DEFINE(USE_ONIG, , "use oniguruma")
+               CPPFLAGS="$CPPFLAGS $ONIG_CFLAGS"
+               LIBS="$LIBS $ONIG_LIBS"
+               AC_CHECK_HEADER([onigposix.h], ,[AC_MSG_ERROR([onigposix.h not found])])
+               AC_CHECK_LIB([onig],[regexec], ,[AC_MSG_ERROR([libonig.a not found])])
+               AC_SUBST(ONIG_CFLAGS)
+               AC_SUBST(ONIG_LIBS)
+       fi ])
+
+dnl
 dnl checking core2duo
 dnl
 if test "$use_gprof" == "no" ;then
Index: src/jdlib/jdmigemo.h
===================================================================
--- src/jdlib/jdmigemo.h	(revision 2575)
+++ src/jdlib/jdmigemo.h	(working copy)
@@ -12,7 +12,7 @@
 #ifdef HAVE_MIGEMO_H
 
 #include <migemo.h>
-#include <regex.h>
+#include "jdregex.h"
 
 #ifdef __cplusplus
 extern "C" {
Index: src/jdlib/jdregex.cpp
===================================================================
--- src/jdlib/jdregex.cpp	(revision 2575)
+++ src/jdlib/jdregex.cpp	(working copy)
@@ -5,19 +5,12 @@
 
 #include "jdregex.h"
 
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #ifdef HAVE_MIGEMO_H
 #include "jdmigemo.h"
 #endif
 
+#include <cstring>
 
-
-#include <regex.h>
-
 enum
 {
     REGEX_MAX_NMATCH = 32
@@ -90,6 +83,8 @@
 {
     regmatch_t pmatch[ REGEX_MAX_NMATCH ];
 
+    memset(pmatch, 0, sizeof(pmatch));
+
     if ( ! m_compiled ) return false;
 	
     if( target.empty() ) return false;
Index: src/jdlib/Makefile.am
===================================================================
--- src/jdlib/Makefile.am	(revision 2575)
+++ src/jdlib/Makefile.am	(working copy)
@@ -40,5 +40,5 @@
 	jdmigemo.h \
 	tfidf.h
 
-AM_CXXFLAGS = @GTKMM_CFLAGS@
+AM_CXXFLAGS = @GTKMM_CFLAGS@ @ONIG_CFLAGS@
 INCLUDES = -I$(top_srcdir)/src
Index: src/jdlib/jdregex.h
===================================================================
--- src/jdlib/jdregex.h	(revision 2575)
+++ src/jdlib/jdregex.h	(working copy)
@@ -5,8 +5,18 @@
 
 #include <string>
 #include <vector>
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef USE_ONIG
+#include <onigposix.h>
+#else
 #include <regex.h>
+#endif	/** USE_ONIG **/
 
+
 namespace JDLIB
 {
     class Regex
Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(revision 2575)
+++ src/Makefile.am	(working copy)
@@ -18,7 +18,7 @@
 	./sound/libsound.a \
 	./xml/libxml.a \
 	./control/libcontrol.a \
-	@LIBS@ @GTKMM_LIBS@ @GTHREAD_LIBS@ @GNUTLS_LIBS@ @OPENSSL_LIBS@ @GNOMEUI_LIBS@ @LIBSM_LIBS@ @ALSA_LIBS@
+	@LIBS@ @GTKMM_LIBS@ @GTHREAD_LIBS@ @GNUTLS_LIBS@ @OPENSSL_LIBS@ @GNOMEUI_LIBS@ @LIBSM_LIBS@ @ALSA_LIBS@ @ONIG_LIBS@
 
 jd_SOURCES = \
 	main.cpp \


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -r1.373 -r1.374
--- jd.spec	19 Dec 2008 05:09:32 -0000	1.373
+++ jd.spec	19 Dec 2008 09:20:22 -0000	1.374
@@ -20,6 +20,7 @@
 # Defined by vendor
 #
 %define         vendor_rel    2
+%define         extra_rel     .onig
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -30,7 +31,7 @@
 
 ##########################################
 %if %{pre_release}
-%define         rel           0.%{vendor_rel}.%{strtag}%{?dist}
+%define         rel           0.%{vendor_rel}.%{strtag}%{?extra_rel}%{?dist}
 %else
 %define         rel           %{vendor_rel}%{?dist}
 %endif
@@ -53,6 +54,9 @@
 Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Patch0:		jd-svn2573-compile.patch
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+# From JD development thread:
+# Modified for migemo
+Patch10:        jd-rev2575-oniguruma.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -64,6 +68,7 @@
 BuildRequires:  cmigemo-devel
 %endif
 BuildRequires:  alsa-lib-devel
+BuildRequires:  oniguruma-devel
 %if %{pre_release}
 BuildRequires:	subversion
 %endif
@@ -76,6 +81,7 @@
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
 #%%patch0 -p0 -b .compile
+%patch10 -p0 -b .onig
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %build
@@ -86,6 +92,7 @@
 
 %configure \
    --with-alsa \
+   --with-oniguruma \
    --with-xdgopen \
 %if 0%{?_with_migemo} >= 1
    --with-migemo \