[mingw32-filesystem] Adjusted PKG_CONFIG_LIBDIR to also search in _mingw32_datadir/pkgconfig/
by Kalev Lember
commit 9781763c8bcd25f3d21c3a6bcaa67de146309c89
Author: Kalev Lember <kalev(a)smartlink.ee>
Date: Tue May 24 10:50:37 2011 +0300
Adjusted PKG_CONFIG_LIBDIR to also search in _mingw32_datadir/pkgconfig/
Right now only mingw32-spice-protocol drops files in share/pkgconfig/,
but there are most likely more packages to come.
macros.mingw32 | 4 ++--
mingw32-filesystem.spec | 7 +++++--
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/macros.mingw32 b/macros.mingw32
index ac86bab..c89cd7e 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -72,7 +72,7 @@ package or when debugging this package.\
%{nil}
%_mingw32_env HOST_CC=gcc; export HOST_CC; \
- PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \
+ PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig:%{_mingw32_datadir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \
unset PKG_CONFIG_PATH; \
_PREFIX="%{_bindir}/%{_mingw32_target}-"; \
for i in `ls -1 ${_PREFIX}* | grep -v 'gcc-'`; do \
@@ -97,7 +97,7 @@ package or when debugging this package.\
unset x i
%_mingw32_pkg_config \
- PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig" pkg-config
+ PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig:%{_mingw32_datadir}/pkgconfig" pkg-config
%_mingw32_configure %{_mingw32_env} ; \
__mingw32_topdir=.; if ! test -x configure; then __mingw32_topdir=..; fi; \\\
diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec
index 7fed193..3f705ec 100644
--- a/mingw32-filesystem.spec
+++ b/mingw32-filesystem.spec
@@ -1,8 +1,8 @@
%define debug_package %{nil}
Name: mingw32-filesystem
-Version: 68
-Release: 3%{?dist}
+Version: 69
+Release: 1%{?dist}
Summary: MinGW base filesystem and environment
Group: Development/Libraries
@@ -169,6 +169,9 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32
%changelog
+* Tue May 24 2011 Kalev Lember <kalev(a)smartlink.ee> - 69-1
+- Adjusted PKG_CONFIG_LIBDIR to also search in _mingw32_datadir/pkgconfig/
+
* Mon May 23 2011 Kalev Lember <kalev(a)smartlink.ee> - 68-3
- Own etc/, share/pkgconfig/, share/xml/ directories
12 years, 10 months
[mingw32-libxml2] Update to 2.7.8
by Kalev Lember
commit 48c56302accbd06955cbfb3afdade196cf35aa17
Author: Kalev Lember <kalev(a)smartlink.ee>
Date: Mon May 23 14:33:46 2011 +0300
Update to 2.7.8
- Dropped upstreamed patches
- Use the CVE-2010-4494 patch from Fedora native libxml2 (#665965)
.gitignore | 1 +
libxml2-2.7.7-xpath-double-free.patch | 22 ++++++++++++++++++++++
libxml2-gnome-bug-561340-fix.patch | 11 -----------
mingw32-libxml2-2.7.2-with-modules.patch | 15 ---------------
mingw32-libxml2.spec | 21 +++++++++------------
sources | 2 +-
6 files changed, 33 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f604503..a9e0040 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
libxml2-2.7.6.tar.gz
+/libxml2-2.7.8.tar.gz
diff --git a/libxml2-2.7.7-xpath-double-free.patch b/libxml2-2.7.7-xpath-double-free.patch
new file mode 100644
index 0000000..c5dbbee
--- /dev/null
+++ b/libxml2-2.7.7-xpath-double-free.patch
@@ -0,0 +1,22 @@
+--- a/xpath.c
++++ a/xpath.c
+@@ -11763,11 +11763,16 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
+
+ if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) {
+ xmlXPathObjectPtr tmp;
+- /* pop the result */
++ /* pop the result if any */
+ tmp = valuePop(ctxt);
+- xmlXPathReleaseObject(xpctxt, tmp);
+- /* then pop off contextObj, which will be freed later */
+- valuePop(ctxt);
++ if (tmp != contextObj) {
++ /*
++ * Free up the result
++ * then pop off contextObj, which will be freed later
++ */
++ xmlXPathReleaseObject(xpctxt, tmp);
++ valuePop(ctxt);
++ }
+ goto evaluation_error;
+ }
diff --git a/mingw32-libxml2.spec b/mingw32-libxml2.spec
index 2974ad5..25353aa 100644
--- a/mingw32-libxml2.spec
+++ b/mingw32-libxml2.spec
@@ -6,8 +6,8 @@
%define __debug_install_post %{_mingw32_debug_install_post}
Name: mingw32-libxml2
-Version: 2.7.6
-Release: 3%{?dist}
+Version: 2.7.8
+Release: 1%{?dist}
Summary: MinGW Windows libxml2 XML processing library
License: MIT
@@ -18,11 +18,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Not required for MinGW.
#Patch0: libxml2-multilib.patch
+Patch2: libxml2-2.7.7-xpath-double-free.patch
# MinGW-specific patches.
-Patch1000: mingw32-libxml2-2.7.2-with-modules.patch
Patch1001: mingw32-libxml2-static-build-compile-fix.patch
-Patch1002: libxml2-gnome-bug-561340-fix.patch
BuildArch: noarch
@@ -35,8 +34,6 @@ BuildRequires: mingw32-gettext
BuildRequires: mingw32-iconv
BuildRequires: mingw32-zlib
-BuildRequires: autoconf, automake, libtool
-
Requires: pkgconfig
@@ -59,13 +56,8 @@ Static version of the MinGW Windows XML processing library.
%prep
%setup -q -n libxml2-%{version}
-%patch1000 -p1
+%patch2 -p1 -b .CVE-2010-4494
%patch1001 -p0
-%patch1002 -p0
-
-# Patched configure.in, so rebuild configure.
-libtoolize --force --copy
-autoreconf
%build
@@ -133,6 +125,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon May 23 2011 Kalev Lember <kalev(a)smartlink.ee> - 2.7.8-1
+- Update to 2.7.8
+- Dropped upstreamed patches
+- Use the CVE-2010-4494 patch from Fedora native libxml2 (#665965)
+
* Mon May 23 2011 Kalev Lember <kalev(a)smartlink.ee> - 2.7.6-3
- Don't install html documentation which duplicates what is in Fedora native
diff --git a/sources b/sources
index 6f53129..4e904ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7740a8ec23878a2f50120e1faa2730f2 libxml2-2.7.6.tar.gz
+8127a65e8c3b08856093099b52599c86 libxml2-2.7.8.tar.gz
12 years, 10 months
[Bug 700815] Review Request: mingw-gtk3 - MinGW Windows GTK+ library
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
https://bugzilla.redhat.com/show_bug.cgi?id=700815
--- Comment #12 from Kalev Lember <kalev(a)smartlink.ee> 2011-05-23 13:04:44 EDT ---
I looked at the -debuginfo macros and it would appear that there's currently a
way to specify the subpackage name with -n switch:
%{_mingw32_debug_package -n mingw32-gtk3}
However, it's currently broken and doesn't work the way that the original
author intended to. It would be possible to easily fix it up; however we need
to first figure out how we want to name the subpackages.
Erik, any opinions whether to go for mingw-$pkg-debuginfo or
mingw32-$pkg-debuginfo with the current "old" toolchain?
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -67,7 +67,7 @@ Group: Development/Debug \
This package provides debug information for package %{name}.\
Debug information is useful when developing applications that use this\
package or when debugging this package.\
-%files debuginfo -f debugfiles.list\
+%files %{-n:-n %{-n*}-}debuginfo -f debugfiles.list\
%defattr(-,root,root,-)\
%{nil}
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
12 years, 10 months
[Bug 700815] Review Request: mingw-gtk3 - MinGW Windows GTK+ library
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
https://bugzilla.redhat.com/show_bug.cgi?id=700815
--- Comment #11 from Kalev Lember <kalev(a)smartlink.ee> 2011-05-23 11:58:22 EDT ---
Thanks Tom.
(In reply to comment #10)
> I had a quick look and it looks fine to me. You don't want to use the
> %{mingw_pkg_name} macro?
Yes, that's right, I don't particularly like the %{mingw_pkg_name} macro name,
it's just way too long and verbose. %{pkg_name} or %{name1} (like you've used
in many places) would be much more readable.
Besides, the current ("old") example spec file uses the literal name everywhere
and not the %{mingw_pkg_name} macro.
Compare yourself:
%files -n mingw32-gtk3
%files -n mingw32-%{mingw_pkg_name}
> Also, the new package naming scheme causes the debuginfo package to be named
> mingw-gtk3-debuginfo versus the old mingw32-gtk3-debuginfo. I don't think this
> is an issue, but I may be overlooking something.
Yeah, that's my concern too.
I'm planning to take a look at the -debuginfo subpackage generating macros soon
to see if it's possible to make them nicer. I'm pretty confident that I can get
rid of the need to manually insert %{?_mingw32_debug_package} in every spec
file. I'm thinking of having per-arch subpackages (mingw32-debuginfo and
mingw64-debuginfo) which are controlled by magical defines ('%define
mingw32_debug_package 1' and '%define mingw64_debug_package 1').
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
12 years, 10 months
[Bug 700815] Review Request: mingw-gtk3 - MinGW Windows GTK+ library
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
https://bugzilla.redhat.com/show_bug.cgi?id=700815
Thomas Sailer <t.sailer(a)alumni.ethz.ch> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |t.sailer(a)alumni.ethz.ch
--- Comment #10 from Thomas Sailer <t.sailer(a)alumni.ethz.ch> 2011-05-23 11:26:21 EDT ---
I had a quick look and it looks fine to me. You don't want to use the
%{mingw_pkg_name} macro?
Also, the new package naming scheme causes the debuginfo package to be named
mingw-gtk3-debuginfo versus the old mingw32-gtk3-debuginfo. I don't think this
is an issue, but I may be overlooking something.
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
12 years, 10 months