rpms/gnotime/devel gnotime-gtkhtml3.8-qof.patch, NONE, 1.1 gnotime.spec, 1.10, 1.11 gnotime-gtkhtml3.6-qof.patch, 1.1, NONE
Toshio Ernie Kuratomi (toshio)
fedora-extras-commits at redhat.com
Thu Aug 18 16:44:34 UTC 2005
Author: toshio
Update of /cvs/extras/rpms/gnotime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17080
Modified Files:
gnotime.spec
Added Files:
gnotime-gtkhtml3.8-qof.patch
Removed Files:
gnotime-gtkhtml3.6-qof.patch
Log Message:
- Fix build for gtkhtml3-3.7 (and 3.8 when it appears)
- Fix gtkhtml test to fail if gtkhtml3 of a known version is not installed.
gnotime-gtkhtml3.8-qof.patch:
--- NEW FILE gnotime-gtkhtml3.8-qof.patch ---
diff -uNr gnotime-2.2.1/configure.in gnotime-2.2.1.new/configure.in
--- gnotime-2.2.1/configure.in 2004-05-23 13:08:18.000000000 -0700
+++ gnotime-2.2.1.new/configure.in 2005-08-18 09:28:25.000000000 -0700
@@ -50,6 +50,8 @@
LIBGTKHTML_REQUIRED=3.0.0
LIBXML2_REQUIRED=2.0.0
SCROLLKEEPER_BUILD_REQUIRED=0.3.5
+LIBQOF_REQUIRED_MIN=0.5.0
+LIBQOF_REQUIRED_MAX=0.5.0
dnl *******************************
dnl Guile checks
@@ -167,7 +169,18 @@
dnl gtkhtml
dnl *******************************
-PKG_CHECK_MODULES(LIBGTKHTML, libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED)
+GTKHTMLPRESENT=no
+for GTKHTMLVER in 3.8 3.7 3.6 3.5 3.4 3.2 3.1 3.0; do
+ if $PKG_CONFIG --exists libgtkhtml-$GTKHTMLVER; then
+ PKG_CHECK_MODULES(LIBGTKHTML, libgtkhtml-$GTKHTMLVER >= $LIBGTKHTML_REQUIRED)
+ GTKHTMLPRESENT=yes
+ break
+ fi
+done
+if test x$GTKHTMLPRESENT = x'no'; then
+ AC_ERROR([gtkhtml3 is needd in order to compile this program.])
+fi
+
AC_SUBST(LIBGTKHTML_CFLAGS)
AC_SUBST(LIBGTKHTML_LIBS)
@@ -182,6 +195,42 @@
AC_SUBST(LIBXML2_LIBS)
dnl *****************************
+dnl libqof
+dnl *****************************
+
+AC_ARG_WITH(system-qof,
+AC_HELP_STRING([--with-system-qof],
+[use installed libqof rather than the bundled one. If not specified, configure will use the system qof if installed, otherwise its own.]),
+
+[
+if test x$withval = "xyes"; then
+ PKG_CHECK_MODULES(LIBQOF, qof-0 >= $LIBQOF_REQUIRED_MIN qof-0 <= $LIBQOF_REQUIRED_MAX)
+ qofbuild=no
+else
+ AC_MSG_NOTICE([Using internal libqof])
+ LIBQOF_CFLAGS='-I$(top_srcdir)/lib -I$(top_srcdir)/lib/qof'
+ LIBQOF_LIBS='$(top_builddir)/lib/qof/libqof.la $(top_builddir)/lib/libqofsql/libqofsql.la'
+ qofbuild=yes
+fi
+],
+[
+if $PKG_CONFIG --exists "qof-0 >= $LIBQOF_REQUIRED_MIN qof-0 <= $LIBQOF_REQUIRED_MAX"; then
+ PKG_CHECK_MODULES(LIBQOF, qof-0 >= $LIBQOF_REQUIRED_MIN qof-0 <= $LIBQOF_REQUIRED_MAX)
+ qofbuild=no
+else
+ AC_MSG_NOTICE([Using internal libqof])
+ LIBQOF_CFLAGS='-I$(top_srcdir)/lib -I$(top_srcdir)/lib/qof'
+ LIBQOF_LIBS='$(top_builddir)/lib/qof/libqof.la $(top_builddir)/lib/libqofsql/libqofsql.la'
+ qofbuild=yes
+fi
+])
+
+AM_CONDITIONAL(QOFBUILD, test x$qofbuild = xyes)
+
+AC_SUBST(LIBQOF_CFLAGS)
+AC_SUBST(LIBQOF_LIBS)
+
+dnl *****************************
dnl scrollkeeper
dnl *****************************
dnl To substitute into the gnotime.spec
diff -uNr gnotime-2.2.1/lib/libqofsql/Makefile.am gnotime-2.2.1.new/lib/libqofsql/Makefile.am
--- gnotime-2.2.1/lib/libqofsql/Makefile.am 2004-04-08 22:09:04.000000000 -0700
+++ gnotime-2.2.1.new/lib/libqofsql/Makefile.am 2005-08-18 09:24:51.000000000 -0700
@@ -1,6 +1,9 @@
## Process this file with automake to produce Makefile.in
+if QOFBUILD
lib_LTLIBRARIES = libqofsql.la
+noinst_PROGRAMS = sql_parse_test
+endif
libqofsql_la_SOURCES = \
parser.c \
@@ -15,9 +18,11 @@
sql_tree.h
qofsqlincludedir = ${pkgincludedir}
+if QOFBUILD
qofsqlinclude_HEADERS = sql_parser.h
-
-noinst_PROGRAMS = sql_parse_test
+else
+noinst_HEADERS = sql_parser.h
+endif
EXTRA_DIST = \
.cvsignore \
diff -uNr gnotime-2.2.1/lib/qof/Makefile.am gnotime-2.2.1.new/lib/qof/Makefile.am
--- gnotime-2.2.1/lib/qof/Makefile.am 2004-05-02 20:46:13.000000000 -0700
+++ gnotime-2.2.1.new/lib/qof/Makefile.am 2005-08-18 09:24:51.000000000 -0700
@@ -1,7 +1,8 @@
# pkglib_LTLIBRARIES = libqof.la
-
+if QOFBUILD
lib_LTLIBRARIES = libqof.la
+endif
libqof_la_SOURCES = \
gnc-date.c \
@@ -28,7 +29,7 @@
qofsql.c
qofincludedir = ${pkgincludedir}
-qofinclude_HEADERS = \
+public_headers = \
gnc-date.h \
gnc-engine-util.h \
gnc-numeric.h \
@@ -67,7 +68,14 @@
qofquerycore-p.h \
qofsession-p.h
-
+if QOFBUILD
+qofinclude_HEADERS = \
+ $(public_headers)
+else
+noinst_HEADERS += \
+ $(public_headers)
+endif
+
EXTRA_DIST = \
README \
.cvsignore
@@ -83,6 +91,3 @@
-I$(includedir) \
-DPREFIX=\""$(prefix)"\" \
-DDATADIR=\""$(datadir)"\"
-
-
-
diff -uNr gnotime-2.2.1/src/Makefile.am gnotime-2.2.1.new/src/Makefile.am
--- gnotime-2.2.1/src/Makefile.am 2004-04-23 18:28:39.000000000 -0700
+++ gnotime-2.2.1.new/src/Makefile.am 2005-08-18 09:24:51.000000000 -0700
@@ -91,11 +91,10 @@
${LIBGNOMEVFS_CFLAGS} \
${LIBGTKHTML_CFLAGS} \
${LIBGLADE_CFLAGS} \
+ ${LIBQOF_CFLAGS} \
${LIBXML2_CFLAGS}
INCLUDES = \
- -I../lib \
- -I../lib/qof \
-I$(includedir) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGTTGLADEDIR=\""$(datadir)/gnotime"\" \
@@ -109,8 +108,7 @@
gnotime_LDADD = \
$(GNOTIME_LIBS) \
- ../lib/qof/libqof.la \
- ../lib/libqofsql/libqofsql.la \
+ $(LIBQOF_LIBS) \
$(LIBGLADE_LIBS) \
$(LIBGTKHTML_LIBS) \
${LIBGNOMEVFS_LIBS} \
@@ -125,7 +123,3 @@
down.xpm \
left.xpm \
design.txt
-
-
-
-
Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/rpms/gnotime/devel/gnotime.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnotime.spec 17 Aug 2005 17:43:47 -0000 1.10
+++ gnotime.spec 18 Aug 2005 16:44:32 -0000 1.11
@@ -1,6 +1,6 @@
Name: gnotime
Version: 2.2.1
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Tracks and reports time spent
Group: Applications/Productivity
@@ -12,9 +12,9 @@
Source2: http://www.tiki-lounge.com/~toshio/fedora/gtt_startprojwin.png
# Simple patch to make the .desktop more complete
Patch0: http://www.tiki-lounge.com/~toshio/fedora/gnotime-desktop.patch
-# Combined patch allowing builds with gtkhtml3.0 or 3.1 and
+# Combined patch allowing builds with gtkhtml3.0 through 3.8 and
# builds with a libqof installed on the system instead of bundled with Gnotime.
-Patch1: http://www.tiki-lounge.com/~toshio/fedora/gnotime-gtkhtml3.6-qof.patch
+Patch1: http://www.tiki-lounge.com/~toshio/fedora/gnotime-gtkhtml3.8-qof.patch
# Fixes includes of qof headers in source files.
Patch2: http://www.tiki-lounge.com/~toshio/fedora/gnotime-qof-include.patch
# Fixes the idle timer for kernel 2.6.
@@ -148,6 +148,10 @@
%{_sysconfdir}/gconf/schemas/*
%changelog
+* Thu Aug 18 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-10
+- Fix build for gtkhtml3-3.7.
+- Fix gtkhtml test to fail if gtkhtml3 is not installed.
+
* Wed Aug 17 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-9
- Add dist tag.
- Rebuild for devel.
--- gnotime-gtkhtml3.6-qof.patch DELETED ---
More information about the fedora-extras-commits
mailing list