pool/gtk2
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 43658 from home:vuntz:branches:GNOME:Factory

Browse Source 
Copy from home:vuntz:branches:GNOME:Factory/gtk2 via accept of submit request 43658 revision 2.
Request was accepted with message:
auto-approving myself, to make it easier for the next batch of reviews

OBS-URL: https://build.opensuse.org/request/show/43658
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=109
This commit is contained in:
Vincent Untz 2010-07-22 21:44:11 +00:00 committed by Git OBS Bridge
parent f1006c2428
commit 358f081c67
7 changed files with 44 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.SuSE
View File

@ -9,9 +9,7 @@ To work around this problem, 64 bit version for SuSE Linux uses special
names for following files: names for following files:
/usr/bin/gtk-query-immodules-2.0: /usr/bin/gtk-query-immodules-2.0-64 /usr/bin/gtk-query-immodules-2.0: /usr/bin/gtk-query-immodules-2.0-64
/usr/bin/gdk-pixbuf-query-loaders: /usr/bin/gdk-pixbuf-query-loaders-64
/etc/gtk-2.0/gtk.immodules: /usr/gtk-2.0/gtk.immodules64 /etc/gtk-2.0/gtk.immodules: /usr/gtk-2.0/gtk.immodules64
/etc/gtk-2.0/gdk-pixbuf.loaders: /usr/gtk-2.0/gdk-pixbuf.loaders64
And following variable: And following variable:

8
SuSEconfig.gtk2
View File

@ -26,18 +26,10 @@ if test -f /var/adm/SuSEconfig/run-gtk ; then
/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
fi fi
if [ -x $r/usr/bin/gdk-pixbuf-query-loaders ] ; then
/usr/bin/gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
fi
if [ -x $r/usr/bin/gtk-query-immodules-2.0-64 ] ; then if [ -x $r/usr/bin/gtk-query-immodules-2.0-64 ] ; then
/usr/bin/gtk-query-immodules-2.0-64 > /etc/gtk-2.0/gtk64.immodules /usr/bin/gtk-query-immodules-2.0-64 > /etc/gtk-2.0/gtk64.immodules
fi fi
if [ -x $r/usr/bin/gdk-pixbuf-query-loaders-64 ] ; then
/usr/bin/gdk-pixbuf-query-loaders-64 > /etc/gtk-2.0/gdk-pixbuf64.loaders
fi
rm /var/adm/SuSEconfig/run-gtk rm /var/adm/SuSEconfig/run-gtk
fi fi

1
baselibs.conf
View File

@ -1,5 +1,4 @@
gtk2 gtk2
+/usr/bin/gdk-pixbuf-query-loaders(-64)?
+/usr/bin/gtk-query-immodules-2.0(-64)? +/usr/bin/gtk-query-immodules-2.0(-64)?
prereq "/usr/bin/touch" prereq "/usr/bin/touch"
post "touch var/adm/SuSEconfig/run-gtk" post "touch var/adm/SuSEconfig/run-gtk"

43
gtk+-2.20.1-pngmess.patch
View File

@ -1,43 +0,0 @@
--- gdk-pixbuf/io-png.c
+++ gdk-pixbuf/io-png.c
@@ -261,7 +261,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
gchar *icc_profile_base64;
const gchar *icc_profile_title;
const gchar *icc_profile;
- gulong icc_profile_size;
+ png_uint_32 icc_profile_size;
guint32 retval;
gint compression_type;
@@ -344,7 +344,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
(png_charpp) &icc_profile_title, &compression_type,
(png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
if (retval != 0) {
- icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, icc_profile_size);
+ icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, (gsize)icc_profile_size);
gdk_pixbuf_set_option (pixbuf, "icc-profile", icc_profile_base64);
g_free (icc_profile_base64);
}
@@ -607,7 +607,7 @@ png_info_callback (png_structp png_read_ptr,
gchar *icc_profile_base64;
const gchar *icc_profile_title;
const gchar *icc_profile;
- gulong icc_profile_size;
+ png_uint_32 icc_profile_size;
guint32 retval;
gint compression_type;
@@ -679,9 +679,9 @@ png_info_callback (png_structp png_read_ptr,
/* Extract embedded ICC profile */
retval = png_get_iCCP (png_read_ptr, png_info_ptr,
(png_charpp) &icc_profile_title, &compression_type,
- (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
+ (png_charpp) &icc_profile, &icc_profile_size);
if (retval != 0) {
- icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, icc_profile_size);
+ icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, (gsize)icc_profile_size);
gdk_pixbuf_set_option (lc->pixbuf, "icc-profile", icc_profile_base64);
g_free (icc_profile_base64);
}
--
cgit v0.8.3.1

10
gtk2-potfiles.patch
View File

@ -1,10 +0,0 @@
--- po/POTFILES.in
+++ po/POTFILES.in
@@ -35,7 +35,6 @@
gdk-pixbuf/io-gdip-gif.c
gdk-pixbuf/io-gdip-ico.c
gdk-pixbuf/io-gdip-jpeg.c
-gdk-pixbuf/io-gdip-png.c
gdk-pixbuf/io-gdip-utils.c
gdk-pixbuf/io-gdip-wmf.c
gdk/win32/gdkmain-win32.c

34
gtk2.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Jul 21 13:39:48 CEST 2010 - vuntz@opensuse.org
- Clean up update to 2.21.4.
- Update baselibs.conf, README.SuSE, SuSEconfig.gtk2 after
gdk-pixbuf split.
- Stop creating %{_libdir}/gtk-2.0/2.10.0/loaders.
- Move gir files to devel subpackage.
- Add gdk-pixbuf-devel Requires to devel package.
- Create var/adm/SuSEconfig/ in %post if necessary.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 6 10:20:52 CEST 2010 - dimstar@opensuse.org Tue Jul 6 10:20:52 CEST 2010 - dimstar@opensuse.org
@ -9,6 +20,8 @@ Tue Jul 6 10:20:52 CEST 2010 - dimstar@opensuse.org
+ gdk-pixbuf has been moved into a separate module + gdk-pixbuf has been moved into a separate module
+ gtk_init warns if it detects GTK2.x and GTK3 being used in the + gtk_init warns if it detects GTK2.x and GTK3 being used in the
same process same process
+ New API for GSeal.
+ Bug fixes.
- Changes from version 2.21.2: - Changes from version 2.21.2:
+ The newly added gdk_drag_context_get_action function has been + The newly added gdk_drag_context_get_action function has been
renamed to gdk_drag_context_get_selected_action to make the renamed to gdk_drag_context_get_selected_action to make the
@ -17,9 +30,28 @@ Tue Jul 6 10:20:52 CEST 2010 - dimstar@opensuse.org
+ New accessors for sealed struct members: + New accessors for sealed struct members:
- gtk_viewport_get_view_window - gtk_viewport_get_view_window
- gdk_drag_context_get_source_window - gdk_drag_context_get_source_window
+ Bug fixes.
- Changes from version 2.21.1: - Changes from version 2.21.1:
+ GDK has been sealed, with the addition of suitable accessors + GDK has been sealed, with the addition of suitable accessors
+ Bug fixes.
- Changes from version 2.20.1:
+ Support tracker 0.8 and 0.9 in the filechooser search code
+ New API:
- add API to convert coords between parent and child windows
- add gdk_window_get_effective_parent() and
gdk_window_get_effective_toplevel() which are offscreen aware
- add gtk_widget_send_focus_change
- add accessors for GtkTextView adjustments
- add API to reset the im context in GtkTextView and GtkEntry
+ Bug fixes.
+ Updated translations.
- Add gdk-pixbuf-devel BuildRequires.
- Drop gtk2-potfiles.patch: fixed upstream.
- Drop gdk-modules-information.diff: gdk-pixbuf has been split, and
this is not needed anymore.
- Drop gtk+-2.20.1-pngmess.patch: fixed upstream.
- Pass --disable-static to configure and remove .la files.
- Update packaging after split of gdk-pixbuf.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 20 12:49:46 CEST 2010 - fridrich.strba@bluewin.ch Thu May 20 12:49:46 CEST 2010 - fridrich.strba@bluewin.ch

21
gtk2.spec
View File

@ -123,7 +123,7 @@ Group: Development/Libraries/X11
Obsoletes: gtk2-devel-64bit Obsoletes: gtk2-devel-64bit
%endif %endif
# #
Requires: %{name} = %{version} atk-devel cairo-devel glibc-devel glib2-devel pango-devel %(rpm -q --whatprovides XFree86-devel --queryformat '%{NAME}') Requires: %{name} = %{version} atk-devel cairo-devel gdk-pixbuf-devel glibc-devel glib2-devel pango-devel %(rpm -q --whatprovides XFree86-devel --queryformat '%{NAME}')
# gtk-builder-convert needs this. # gtk-builder-convert needs this.
Requires: pyxml Requires: pyxml
# gail is part of gtk+ as of 2.13.x # gail is part of gtk+ as of 2.13.x
@ -174,9 +174,9 @@ export CFLAGS="$CFLAGS -mminimal-toc"
# fix crash in gdm, nautilus, etc. (bgo#596977) # fix crash in gdm, nautilus, etc. (bgo#596977)
export CFLAGS=`echo $CFLAGS | sed -e 's/-fomit-frame-pointer//g'` export CFLAGS=`echo $CFLAGS | sed -e 's/-fomit-frame-pointer//g'`
%configure \ %configure \
--disable-static \
--enable-man \ --enable-man \
--with-xinput=xfree \ --with-xinput=xfree
--disable-static
#make %{?jobs:-j%jobs} #make %{?jobs:-j%jobs}
make make
@ -190,7 +190,7 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gtk.immodules
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gtk-2.0 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gtk-2.0
touch $RPM_BUILD_ROOT%{_localstatedir}/cache/gtk-2.0/icon-theme.cache-list touch $RPM_BUILD_ROOT%{_localstatedir}/cache/gtk-2.0/icon-theme.cache-list
mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/{,2.10.0/}{engines,filesystems,immodules,loaders,modules,printbackends} mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/{,2.10.0/}{engines,filesystems,immodules,modules,printbackends}
%find_lang gtk20 %find_lang gtk20
%find_lang gtk20-properties gtk20.lang %find_lang gtk20-properties gtk20.lang
%if "%_lib" == "lib64" %if "%_lib" == "lib64"
@ -206,6 +206,7 @@ rm -rf $RPM_BUILD_ROOT
%post %post
/sbin/ldconfig /sbin/ldconfig
test -d var/adm/SuSEconfig/ || mkdir -p var/adm/SuSEconfig/
touch var/adm/SuSEconfig/run-gtk touch var/adm/SuSEconfig/run-gtk
%preun %preun
@ -223,10 +224,9 @@ fi
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%if "%_lib" == "lib64"
%doc AUTHORS COPYING README README.SuSE NEWS ChangeLog
%else
%doc AUTHORS COPYING README NEWS ChangeLog %doc AUTHORS COPYING README NEWS ChangeLog
%if "%_lib" == "lib64"
%doc README.SuSE
%endif %endif
%{_bindir}/*query* %{_bindir}/*query*
%{_bindir}/gtk-update-icon-cache %{_bindir}/gtk-update-icon-cache
@ -248,7 +248,6 @@ fi
%endif %endif
%{_sysconfdir}/gtk-2.0/im-multipress.conf %{_sysconfdir}/gtk-2.0/im-multipress.conf
/sbin/conf.d/SuSEconfig.gtk2 /sbin/conf.d/SuSEconfig.gtk2
%{_datadir}/gir-1.0/*.gir
%{_libdir}/girepository-1.0/*.typelib %{_libdir}/girepository-1.0/*.typelib
%files branding-upstream %files branding-upstream
@ -262,7 +261,9 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/gtk-builder-convert %{_bindir}/gtk-builder-convert
%{_bindir}/*-demo %{_bindir}/*-demo
%{_datadir}/gtk-2.0 %{_datadir}/gir-1.0/*.gir
%dir %{_datadir}/gtk-2.0
%{_datadir}/gtk-2.0/demo
%{_datadir}/aclocal/*.m4 %{_datadir}/aclocal/*.m4
%{_includedir}/gail-1.0 %{_includedir}/gail-1.0
%{_includedir}/gtk-2.0 %{_includedir}/gtk-2.0
@ -271,6 +272,6 @@ fi
%{_libdir}/gtk-2.0/include %{_libdir}/gtk-2.0/include
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%doc %{_mandir}/man*/* %doc %{_mandir}/man*/*
%{_datadir}/gtk-doc/html/* %doc %{_datadir}/gtk-doc/html/*
%changelog %changelog