commit e87f9857a33fa9c81851e0ba7a580e3c036b46e8
Author: Elan Ruusamäe <g...@delfi.ee>
Date: Sun Mar 22 13:56:24 2015 +0200
add format-security.patch, drop unneeded -Wl,--as-needed
format-security.patch | 40 ++++++++++++++++++++++++++++++++++++++++
libgtkhtml.spec | 10 +++++-----
2 files changed, 45 insertions(+), 5 deletions(-)
---
diff --git a/libgtkhtml.spec b/libgtkhtml.spec
index e4e53c5..fc1b983 100644
--- a/libgtkhtml.spec
+++ b/libgtkhtml.spec
@@ -2,18 +2,19 @@ Summary: GTK HTML widget 2
Summary(pl.UTF-8): Widget GTK HTML dla GNOME2
Name: libgtkhtml
Version: 2.11.1
-Release: 5
+Release: 6
License: GPL/LGPL
Group: X11/Libraries
-Source0:
http://ftp.gnome.org/pub/gnome/sources/libgtkhtml/2.11/%{name}-%{version}.tar.bz2
+Source0:
http://ftp.gnome.org/pub/GNOME/sources/libgtkhtml/2.11/%{name}-%{version}.tar.bz2
# Source0-md5: a1d1a197dcff8c4571659deef5495e24
+Patch0: format-security.patch
URL: http://gtkhtml2.codefactory.se/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gail-devel >= 1.9.0
BuildRequires: gtk+2-devel >= 2:2.10.0
-BuildRequires: libtool
BuildRequires: libselinux-devel
+BuildRequires: libtool
BuildRequires: libxml2-devel >= 1:2.6.26
BuildRequires: pkgconfig
BuildRequires: xorg-lib-libSM-devel
@@ -55,19 +56,18 @@ Statyczna wersja biblioteki GTK HTML 2.
%prep
%setup -q
+%patch0 -p1
%build
%{__libtoolize}
%{__aclocal}
%{__autoconf}
%{__automake}
-LDFLAGS="%{rpmldflags} -Wl,--as-needed"
%configure
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
diff --git a/format-security.patch b/format-security.patch
new file mode 100644
index 0000000..ab4b796
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,40 @@
+--- libgtkhtml-2.11.1/libgtkhtml/a11y/htmlboxblocktextaccessible.c~
2015-03-22 13:54:32.000000000 +0200
++++ libgtkhtml-2.11.1/libgtkhtml/a11y/htmlboxblocktextaccessible.c
2015-03-22 13:54:34.104449611 +0200
+@@ -999,7 +999,7 @@
+ attrib_set = gail_misc_add_attribute (attrib_set,
+ ATK_TEXT_ATTR_PIXELS_ABOVE_LINES,
+ value);
+- value = g_strdup_printf (atk_text_attribute_get_value
(ATK_TEXT_ATTR_EDITABLE, 0));
++ value = g_strdup_printf ("%s", atk_text_attribute_get_value
(ATK_TEXT_ATTR_EDITABLE, 0));
+ attrib_set = gail_misc_add_attribute (attrib_set,
+ ATK_TEXT_ATTR_EDITABLE,
+ value);
+@@ -1007,7 +1007,7 @@
+ int_value = 0;
+ else
+ int_value = 1;
+- value = g_strdup_printf (atk_text_attribute_get_value
(ATK_TEXT_ATTR_INVISIBLE, int_value));
++ value = g_strdup_printf ("%s", atk_text_attribute_get_value
(ATK_TEXT_ATTR_INVISIBLE, int_value));
+ attrib_set = gail_misc_add_attribute (attrib_set,
+ ATK_TEXT_ATTR_INVISIBLE,
+ value);
+--- libgtkhtml-2.11.1/libgtkhtml/a11y/htmlboxtextaccessible.c~ 2015-03-22
13:55:18.000000000 +0200
++++ libgtkhtml-2.11.1/libgtkhtml/a11y/htmlboxtextaccessible.c 2015-03-22
13:55:20.216748906 +0200
+@@ -945,7 +945,7 @@
+ attrib_set = gail_misc_add_attribute (attrib_set,
+ ATK_TEXT_ATTR_PIXELS_ABOVE_LINES,
+ value);
+- value = g_strdup_printf (atk_text_attribute_get_value
(ATK_TEXT_ATTR_EDITABLE, 0));
++ value = g_strdup_printf ("%s", atk_text_attribute_get_value
(ATK_TEXT_ATTR_EDITABLE, 0));
+ attrib_set = gail_misc_add_attribute (attrib_set,
+ ATK_TEXT_ATTR_EDITABLE,
+ value);
+@@ -953,7 +953,7 @@
+ int_value = 0;
+ else
+ int_value = 1;
+- value = g_strdup_printf (atk_text_attribute_get_value
(ATK_TEXT_ATTR_INVISIBLE, int_value));
++ value = g_strdup_printf ("%s", atk_text_attribute_get_value
(ATK_TEXT_ATTR_INVISIBLE, int_value));
+ attrib_set = gail_misc_add_attribute (attrib_set,
+ ATK_TEXT_ATTR_INVISIBLE,
+ value);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libgtkhtml.git/commitdiff/e87f9857a33fa9c81851e0ba7a580e3c036b46e8
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
