rpms/mozvoikko/devel 90_modify-makefile-to-use-pkg-config.patch, NONE, 1.1 91_mozvoikko-Makefile-xulrunner-cleanup.patch, NONE, 1.1 92_mozvoikko-link-as-needed.patch, NONE, 1.1 mozvoikko.spec, 1.4, 1.5 mozvoikko-fedora-includes.patch, 1.1, NONE
Ville-Pekka Vainio
vpv at fedoraproject.org
Tue Jan 27 21:09:19 UTC 2009
Author: vpv
Update of /cvs/pkgs/rpms/mozvoikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5370
Modified Files:
mozvoikko.spec
Added Files:
90_modify-makefile-to-use-pkg-config.patch
91_mozvoikko-Makefile-xulrunner-cleanup.patch
92_mozvoikko-link-as-needed.patch
Removed Files:
mozvoikko-fedora-includes.patch
Log Message:
* Tue Jan 27 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 0.9.5-6
- Add a series of patches developed together with upstream and the
Ubuntu/Debian maintainer:
- Uses pkg-config --cflags and --libs, no rpath anymore
- Cleans up some unneeded cruft from Makefile.xulrunner
- Uses -Wl,--as-needed to reduce shared library dependencies
- Some discussion about pkg-config and rpath in Launchpad #297169
90_modify-makefile-to-use-pkg-config.patch:
--- NEW FILE 90_modify-makefile-to-use-pkg-config.patch ---
--- mozvoikko-0.9.5/src/Makefile.xulrunner 2009-01-13 20:18:49.000000000 +0200
+++ mozvoikko-0.9.5/src/Makefile.xulrunner 2009-01-13 20:20:19.000000000 +0200
@@ -14,23 +14,14 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-XULRUNNER_SDK=$(shell pkg-config --variable=sdkdir libxul)
-XULRUNNER_INCDIR=$(shell pkg-config --variable=includedir libxul)
NSPR_INCLUDES=$(shell pkg-config --cflags-only-I nspr)
DESTDIR=/usr/lib/firefox
CC=g++ -c
CC_LINK=g++ -shared -Wl,--no-undefined
include ../mozvoikko.config
-XULRUNNER_INCLUDES=-I$(XULRUNNER_SDK)/sdk/include -I$(XULRUNNER_SDK)/include \
--I$(XULRUNNER_INCDIR)/xpcom \
--I$(XULRUNNER_INCDIR)/spellchecker \
--I$(XULRUNNER_INCDIR)/uconv \
--I$(XULRUNNER_INCDIR)/unicharutil \
--I$(XULRUNNER_INCDIR)/xulapp \
--I$(XULRUNNER_INCDIR)/unstable
-XULRUNNER_LIBS=-L$(XULRUNNER_SDK)/sdk/lib -L$(XULRUNNER_SDK)/sdk/bin \
--Wl,-rpath-link,$(XULRUNNER_SDK)/sdk/bin -lxpcomglue_s -lxpcom -lnspr4
+XULRUNNER_INCLUDES=$(shell pkg-config --cflags libxul-unstable)
+XULRUNNER_LIBS=$(shell pkg-config --libs libxul-unstable)
HEADERS=mozVoikko.hxx mozVoikkoSpell.hxx mozVoikkoUtils.hxx
OBJECTS=mozVoikko mozVoikkoSpell mozVoikkoUtils mozVoikkoSpellFactory
91_mozvoikko-Makefile-xulrunner-cleanup.patch:
--- NEW FILE 91_mozvoikko-Makefile-xulrunner-cleanup.patch ---
Index: src/Makefile.xulrunner
===================================================================
--- src/Makefile.xulrunner (revision 2472)
+++ src/Makefile.xulrunner (working copy)
@@ -14,7 +14,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-NSPR_INCLUDES=$(shell pkg-config --cflags-only-I nspr)
DESTDIR=/usr/lib/firefox
CC=g++ -c
CC_LINK=g++ -shared -Wl,--no-undefined
@@ -32,8 +31,8 @@
ifndef CFLAGS
CFLAGS=-O2
endif
-CC_FLAGS=$(CFLAGS) -Wall -Werror -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fshort-wchar -fPIC
-CC_INCLUDES=$(NSPR_INCLUDES) $(XULRUNNER_INCLUDES) \
+CC_FLAGS=$(CFLAGS) -Wall -Werror -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fPIC
+CC_INCLUDES=$(XULRUNNER_INCLUDES) \
-include mozilla-config.h -include xpcom-config.h
CC_DEFINES=-DSYSTEM_LIBVOIKKO
CC_LIBS=$(XULRUNNER_LIBS)
92_mozvoikko-link-as-needed.patch:
--- NEW FILE 92_mozvoikko-link-as-needed.patch ---
diff -Nur mozvoikko-0.9.5-1/src/Makefile.xulrunner mozvoikko-0.9.5-2/src/Makefile.xulrunner
--- mozvoikko-0.9.5-1/src/Makefile.xulrunner 2009-01-27 22:30:51.000000000 +0200
+++ mozvoikko-0.9.5-2/src/Makefile.xulrunner 2009-01-27 22:36:12.000000000 +0200
@@ -35,7 +35,7 @@
CC_INCLUDES=$(XULRUNNER_INCLUDES) \
-include mozilla-config.h -include xpcom-config.h
CC_DEFINES=-DSYSTEM_LIBVOIKKO
-CC_LIBS=$(XULRUNNER_LIBS)
+CC_LIBS=-Wl,--as-needed $(XULRUNNER_LIBS)
.PHONY: all clean xpi extension-files install-unpacked
Index: mozvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mozvoikko/devel/mozvoikko.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mozvoikko.spec 25 Dec 2008 23:46:29 -0000 1.4
+++ mozvoikko.spec 27 Jan 2009 21:08:49 -0000 1.5
@@ -12,15 +12,18 @@
Name: mozvoikko
Version: 0.9.5
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Finnish Voikko spell-checker extension for Mozilla programs
Group: Applications/Internet
License: GPLv2+
URL: http://voikko.sourceforge.net
Source0: http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
-# Simplify the includes, we only need the stable and unstable header dirs in
-# Fedora
-Patch0: mozvoikko-fedora-includes.patch
+# Use more pkg-config queries, from upstream
+Patch0: 90_modify-makefile-to-use-pkg-config.patch
+# Clean up unneeded parts of the Makefile, sent upstream
+Patch1: 91_mozvoikko-Makefile-xulrunner-cleanup.patch
+# Use -Wl,--as-needed to reduce dependencies, suggested by upstream
+Patch2: 92_mozvoikko-link-as-needed.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# For xulrunner unstable
@@ -43,6 +46,8 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p0
+%patch2 -p1
%build
@@ -70,6 +75,14 @@
%changelog
+* Tue Jan 27 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 0.9.5-6
+- Add a series of patches developed together with upstream and the
+ Ubuntu/Debian maintainer:
+ - Uses pkg-config --cflags and --libs, no rpath anymore
+ - Cleans up some unneeded cruft from Makefile.xulrunner
+ - Uses -Wl,--as-needed to reduce shared library dependencies
+ - Some discussion about pkg-config and rpath in Launchpad #297169
+
* Fri Dec 26 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 0.9.5-5
- Rebuild against gecko 1.9.1
- Bump Release so that it's at least as high as in F10 and F9
--- mozvoikko-fedora-includes.patch DELETED ---
More information about the fedora-extras-commits
mailing list