[mingw-gtkhtml3: 7/20] Update to 3.31.92
epienbro
epienbro at fedoraproject.org
Tue Mar 6 20:04:24 UTC 2012
commit 41d4472d0d9360dcbef7152669dab5128c5f4274
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Fri Sep 24 13:10:26 2010 +0200
Update to 3.31.92
.gitignore | 1 +
gtkhtml-make-gconf-optional.patch | 12 ++++++------
gtkhtml-make-iso-codes-optional.patch | 8 ++++----
mingw32-gtkhtml3.spec | 19 +++++++++++--------
sources | 2 +-
5 files changed, 23 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index df2469d..9a7dcbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
gtkhtml-3.30.2.tar.bz2
+/gtkhtml-3.31.92.tar.bz2
diff --git a/gtkhtml-make-gconf-optional.patch b/gtkhtml-make-gconf-optional.patch
index c39e6e2..58ec022 100644
--- a/gtkhtml-make-gconf-optional.patch
+++ b/gtkhtml-make-gconf-optional.patch
@@ -200,17 +200,17 @@ index 6aa0cef..7ed2d0d 100644
}
static void
---- a/configure.ac.orig 2010-04-26 06:58:42.000000000 +0200
-+++ b/configure.ac 2010-05-08 12:19:55.308862096 +0200
-@@ -146,11 +146,16 @@
+--- a/configure.ac.orig 2010-08-30 06:25:50.000000000 +0200
++++ b/configure.ac 2010-09-24 13:00:40.323990120 +0200
+@@ -174,11 +174,16 @@
dnl **********************************
dnl GTKHTML modules
dnl **********************************
--GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant >= enchant_minimum_version gconf-2.0 iso-codes"
-+GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant iso-codes"
+-GTKHTML_MODULES="$GTK_PACKAGE >= $gtk_minimum_version enchant >= enchant_minimum_version gconf-2.0 iso-codes"
++GTKHTML_MODULES="$GTK_PACKAGE >= $gtk_minimum_version enchant >= enchant_minimum_version iso-codes"
+PKG_CHECK_MODULES(GCONF, gconf-2.0, have_gconf=yes, have_gconf=no)
+if test "$have_gconf" = "true" ; then
-+ GTKHTML_MODULES="$GTKHTML_MODULES gconf-2.0"
++ GTKHTML_MODULES="$GTKHTML_MODULES gconf-2.0"
+fi
PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES)
AC_SUBST(GTKHTML_CFLAGS)
diff --git a/gtkhtml-make-iso-codes-optional.patch b/gtkhtml-make-iso-codes-optional.patch
index 03e2a7a..984a137 100644
--- a/gtkhtml-make-iso-codes-optional.patch
+++ b/gtkhtml-make-iso-codes-optional.patch
@@ -1,11 +1,11 @@
--- a/configure.ac.orig 2010-05-08 18:13:14.000000000 +0200
+++ b/configure.ac 2010-05-08 18:14:05.606880865 +0200
-@@ -146,7 +146,7 @@
+@@ -174,7 +174,7 @@
dnl **********************************
dnl GTKHTML modules
dnl **********************************
--GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant iso-codes"
-+GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant"
+-GTKHTML_MODULES="$GTK_PACKAGE >= $gtk_minimum_version enchant >= enchant_minimum_version iso-codes"
++GTKHTML_MODULES="$GTK_PACKAGE >= $gtk_minimum_version enchant >= enchant_minimum_version"
PKG_CHECK_MODULES(GCONF, gconf-2.0, have_gconf=yes, have_gconf=no)
if test "$have_gconf" = "true" ; then
- GTKHTML_MODULES="$GTKHTML_MODULES gconf-2.0"
+ GTKHTML_MODULES="$GTKHTML_MODULES gconf-2.0"
diff --git a/mingw32-gtkhtml3.spec b/mingw32-gtkhtml3.spec
index df7730c..49a86f1 100644
--- a/mingw32-gtkhtml3.spec
+++ b/mingw32-gtkhtml3.spec
@@ -6,14 +6,14 @@
%define __debug_install_post %{_mingw32_debug_install_post}
Name: mingw32-gtkhtml3
-Version: 3.30.2
+Version: 3.31.92
Release: 1%{?dist}
Summary: MinGW library for embedding a lightweight web browser in GTK programs
License: LGPLv2+
Group: Development/Libraries
URL: http://projects.gnome.org/evolution/
-Source: http://download.gnome.org/sources/gtkhtml/3.30/gtkhtml-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gtkhtml/3.31/gtkhtml-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# GConf doesn't work well on Win32 and it's only used by GtkHTML
@@ -122,7 +122,7 @@ mv $RPM_BUILD_ROOT/build_static%{_mingw32_libdir}/*.a $RPM_BUILD_ROOT%{_mingw32_
# Manually merge the libtool files
sed -i s/"old_library=''"/"old_library='libgtkhtml-3.14.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libgtkhtml-3.14.la
-sed -i s/"old_library=''"/"old_library='libgtkhtml-editor.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libgtkhtml-editor.la
+sed -i s/"old_library=''"/"old_library='libgtkhtml-editor-3.14.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libgtkhtml-editor-3.14.la
# Drop the folder which was temporary used for installing the static bits
rm -rf $RPM_BUILD_ROOT/build_static
@@ -142,24 +142,27 @@ rm -rf $RPM_BUILD_ROOT
%doc COPYING.LIB
%{_mingw32_bindir}/gtkhtml-editor-test.exe
%{_mingw32_bindir}/libgtkhtml-3.14-19.dll
-%{_mingw32_bindir}/libgtkhtml-editor-0.dll
+%{_mingw32_bindir}/libgtkhtml-editor-3.14-0.dll
%{_mingw32_bindir}/testgtkhtml.exe
%{_mingw32_includedir}/libgtkhtml-3.14
%{_mingw32_libdir}/libgtkhtml-3.14.dll.a
%{_mingw32_libdir}/libgtkhtml-3.14.la
-%{_mingw32_libdir}/libgtkhtml-editor.dll.a
-%{_mingw32_libdir}/libgtkhtml-editor.la
+%{_mingw32_libdir}/libgtkhtml-editor-3.14.dll.a
+%{_mingw32_libdir}/libgtkhtml-editor-3.14.la
%{_mingw32_libdir}/pkgconfig/libgtkhtml-3.14.pc
-%{_mingw32_libdir}/pkgconfig/gtkhtml-editor.pc
+%{_mingw32_libdir}/pkgconfig/gtkhtml-editor-3.14.pc
%{_mingw32_datadir}/gtkhtml-3.14
%files static
%defattr(-,root,root,-)
%{_mingw32_libdir}/libgtkhtml-3.14.a
-%{_mingw32_libdir}/libgtkhtml-editor.a
+%{_mingw32_libdir}/libgtkhtml-editor-3.14.a
%changelog
+* Fri Sep 24 2010 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.31.92-1
+- Update to 3.31.92
+
* Tue Jul 6 2010 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.30.2-1
- Update to 3.30.2
diff --git a/sources b/sources
index 83e2711..5ea0b88 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-590c626e507a2ef9c9026699283d4004 gtkhtml-3.30.2.tar.bz2
+be27fdc97811655b1c7e652c987c3bbd gtkhtml-3.31.92.tar.bz2
More information about the scm-commits
mailing list