From a2a34a07df58d36872f99728cbc4322b957c205e Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 04:21:15 +0100 Subject: [PATCH] update to 2.40.0 [release 2.40.0-1mamba;Sun May 10 2020] --- libgdk-pixbuf.spec | 177 ++++++++++++++++----------------------------- 1 file changed, 63 insertions(+), 114 deletions(-) diff --git a/libgdk-pixbuf.spec b/libgdk-pixbuf.spec index ac12177..df82f1e 100644 --- a/libgdk-pixbuf.spec +++ b/libgdk-pixbuf.spec @@ -8,8 +8,8 @@ Name: libgdk-pixbuf Epoch: 1 -Version: 2.36.9 -Release: 2mamba +Version: 2.40.0 +Release: 1mamba Summary: An image loading library Group: System/Libraries Vendor: openmamba @@ -20,34 +20,17 @@ Source: ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/%{majversion}/gd License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: ldconfig BuildRequires: libX11-devel -BuildRequires: libXau-devel -BuildRequires: libXdmcp-devel -BuildRequires: libblkid-devel -BuildRequires: libbsd-devel -BuildRequires: libffi-devel BuildRequires: libglib-devel BuildRequires: libjasper-devel BuildRequires: libjpeg-devel -BuildRequires: libmount-devel -BuildRequires: libpcre-devel BuildRequires: libpng-devel -BuildRequires: libselinux-devel -BuildRequires: libsepol-devel -BuildRequires: libuuid-devel -BuildRequires: libxcb-devel -BuildRequires: libz-devel +BuildRequires: libtiff-devel +BuildRequires: shared-mime-info ## AUTOBUILDREQ-END -#BuildRequires: libdb47-devel BuildRequires: vim -#%ifarch x86_64 -#BuildRequires: gcc-multilib -#BuildRequires: glibc-multilib-devel -#BuildRequires: lib32-libglib-devel -#BuildRequires: lib32-libpng-devel -#BuildRequires: lib32-libjpeg-turbo-devel -#BuildRequires: lib32-libtiff-devel -#%endif +Requires: gdk-pixbuf = %{?epoch:%epoch:}%{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-root # checking for mediaLib 2.3... checking for mlib_ImageSetStruct in -lmlib... no @@ -66,20 +49,12 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} %{name} is an image loading library that can be extended by loadable modules for new image formats. It is used by toolkits such as GTK+ or clutter. This package contains libraries and header files need for development. -%package -n lib32-%{name} -Summary: An image loading library -Group: System/Libraries +%package -n gdk-pixbuf +Summary: Tools for %{name} +Group: System/Tools +Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} -%description -n lib32-%{name} -An image loading library. - -%package -n lib32-%{name}-devel -Summary: Devel package for lib32-%{name} -Group: Development/Libraries -Requires: lib32-%{name} = %{?epoch:%epoch:}%{version}-%{release} -Requires: %{name}-devel = %{?epoch:%epoch:}%{version}-%{release} - -%description -n lib32-%{name}-devel +%description -n gdk-pixbuf %{name} is an image loading library that can be extended by loadable modules for new image formats. It is used by toolkits such as GTK+ or clutter. This package contains libraries and header files need for development. @@ -90,46 +65,45 @@ Group: Documentation %description apidocs This package contains %{name} API documentation. +%debug_package + %prep %setup -q -n gdk-pixbuf-%{version} %build -%configure \ -%ifnarch arm - --enable-gtk-doc \ -%endif - --with-libjasper \ - --with-x11 \ - --program-suffix=%{arch_suffix} +%meson \ + -Ddocs=true \ + -Djasper=true \ + -Dx11=true -%make +%meson_build + +#% configure \ +#%ifnarch arm +# --enable-gtk-doc \ +#%endif +# --with-libjasper \ +# --with-x11 \ +# --program-suffix=%{arch_suffix} +# +#% make %install [ "%{buildroot}" != / ] && rm -rf %{buildroot} -%makeinstall \ - RUN_QUERY_LOADER_TEST=false +%meson_install + +#% makeinstall \ +# RUN_QUERY_LOADER_TEST=false touch %{buildroot}%{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache %find_lang gdk-pixbuf -#%ifarch x86_64 -## x86_64 lib64 support -#make clean -#CC=%{_target_platform}-gcc \ -#CFLAGS="%{optflags} -m32" \ -#CXXFLAGS="%{optflags} -m32" \ -#./configure \ -# --prefix=%{_prefix} \ -# --libdir=%{_prefix}/lib \ -# --with-x11 \ -# --disable-introspection \ -# --program-suffix=-i586 -# -#make -#make install DESTDIR=`pwd`/lib32 RUN_QUERY_LOADER_TEST=false -#cp -a lib32/%{_prefix}/lib %{buildroot}%{_prefix}/ -#%endif +# biarch support +install -d -m0755 %{buildroot}%{_libexecdir} +mv %{buildroot}%{_bindir}/gdk-pixbuf-query-loaders %{buildroot}%{_libexecdir}/gdk-pixbuf-query-loaders +ln -s %{_libexecdir}/gdk-pixbuf-query-loaders %{buildroot}%{_bindir}/gdk-pixbuf-query-loaders + %clean [ "%{buildroot}" != / ] && rm -rf %{buildroot} @@ -144,14 +118,7 @@ touch %{buildroot}%{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache %posttrans if [ $1 -ge 1 ]; then -%ifarch %{ix86} - if [ ! -e /usr/lib64/gdk-pixbuf-2.0/2.10.0/loaders.cache ]; then -%endif - ln -snf gdk-pixbuf-query-loaders%{arch_suffix} %{_bindir}/gdk-pixbuf-query-loaders -%ifarch %{ix86} - fi -%endif - %{_bindir}/gdk-pixbuf-query-loaders%{arch_suffix} --update-cache || : + %{_libexecdir}/gdk-pixbuf-query-loaders --update-cache || : # legacy cleanups rm -f /etc/gtk-2.0/gdk-pixbuf.loaders rm -f /etc/gtk-3.0/gdk-pixbuf.loaders @@ -162,26 +129,15 @@ if [ $1 -ge 1 ]; then fi : -%posttrans devel +%pre devel if [ $1 -ge 1 ]; then -%ifarch %{ix86} - if [ ! -e /usr/lib64/gdk-pixbuf-2.0/2.10.0/loaders.cache ]; then -%endif - ln -snf gdk-pixbuf-csource%{arch_suffix} %{_bindir}/gdk-pixbuf-csource - ln -snf gdk-pixbuf-pixdata%{arch_suffix} %{_bindir}/gdk-pixbuf-pixdata -%ifarch %{ix86} - fi -%endif + [ -L %{_bindir}/gdk-pixbuf-csource ] && rm -f %{_bindir}/gdk-pixbuf-csource + [ -L %{_bindir}/gdk-pixbuf-pixdata ] && rm -f %{_bindir}/gdk-pixbuf-pixdata fi : -%post -n lib32-%{name} -p /sbin/ldconfig -%postun -n lib32-%{name} -p /sbin/ldconfig - -%files -f gdk-pixbuf.lang +%files %defattr(-,root,root) -%{_bindir}/gdk-pixbuf-query-loaders%{arch_suffix} -%{_bindir}/gdk-pixbuf-thumbnailer%{arch_suffix} %{_libdir}/libgdk_pixbuf-2.0.so.* %{_libdir}/libgdk_pixbuf_xlib-2.0.so.* %dir %{_libdir}/gdk-pixbuf-2.0 @@ -190,14 +146,21 @@ fi %{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*.so %ghost %{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache %{_libdir}/girepository-1.0/GdkPixbuf-2.0.typelib +%{_libdir}/girepository-1.0/GdkPixdata-2.0.typelib +%{_libexecdir}/gdk-pixbuf-query-loaders +%doc COPYING + +%files -n gdk-pixbuf -f gdk-pixbuf.lang +%defattr(-,root,root) +%{_bindir}/gdk-pixbuf-query-loaders +%{_bindir}/gdk-pixbuf-thumbnailer %{_datadir}/thumbnailers/gdk-pixbuf-thumbnailer.thumbnailer -%{_mandir}/man1/gdk-pixbuf-query-loaders%{arch_suffix}.1* -%doc AUTHORS COPYING +%{_mandir}/man1/gdk-pixbuf-query-loaders.1* %files devel %defattr(-,root,root) -%{_bindir}/gdk-pixbuf-csource%{arch_suffix} -%{_bindir}/gdk-pixbuf-pixdata%{arch_suffix} +%{_bindir}/gdk-pixbuf-csource +%{_bindir}/gdk-pixbuf-pixdata %dir %{_includedir}/gdk-pixbuf-2.0 %dir %{_includedir}/gdk-pixbuf-2.0/gdk-pixbuf %{_includedir}/gdk-pixbuf-2.0/gdk-pixbuf/*.h @@ -205,13 +168,15 @@ fi %{_includedir}/gdk-pixbuf-2.0/gdk-pixbuf-xlib/*.h %{_libdir}/libgdk_pixbuf-2.0.so %{_libdir}/libgdk_pixbuf_xlib-2.0.so -%{_libdir}/libgdk_pixbuf-2.0.la -%{_libdir}/libgdk_pixbuf_xlib-2.0.la -%{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*.la %{_datadir}/gir-1.0/GdkPixbuf-2.0.gir +%{_datadir}/gir-1.0/GdkPixdata-2.0.gir +%dir %{_libexecdir}/installed-tests/gdk-pixbuf +%{_libexecdir}/installed-tests/gdk-pixbuf/* +%dir %{_datadir}/installed-tests/gdk-pixbuf +%{_datadir}/installed-tests/gdk-pixbuf/* %{_libdir}/pkgconfig/gdk-pixbuf-2.0.pc %{_libdir}/pkgconfig/gdk-pixbuf-xlib-2.0.pc -%{_mandir}/man1/gdk-pixbuf-csource%{arch_suffix}.1* +%{_mandir}/man1/gdk-pixbuf-csource.1* %doc NEWS %files apidocs @@ -219,26 +184,10 @@ fi %dir %{_datadir}/gtk-doc/html/gdk-pixbuf %{_datadir}/gtk-doc/html/gdk-pixbuf/* -#%ifarch x86_64 -#%files -n lib32-%{name} -#%defattr(-,root,root) -#%{_prefix}/lib/libgdk_pixbuf-2.0.so.* -#%{_prefix}/lib/libgdk_pixbuf_xlib-2.0.so.* -#%dir %{_prefix}/lib/gdk-pixbuf-2.0/2.10.0/loaders -#%{_prefix}/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*.so - -#%files -n lib32-%{name}-devel -#%defattr(-,root,root) -#%{_prefix}/lib/libgdk_pixbuf-2.0.so -#%{_prefix}/lib/libgdk_pixbuf_xlib-2.0.so -#%{_prefix}/lib/libgdk_pixbuf-2.0.la -#%{_prefix}/lib/libgdk_pixbuf_xlib-2.0.la -#%{_prefix}/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*.la -#%{_prefix}/lib/pkgconfig/gdk-pixbuf-2.0.pc -#%{_prefix}/lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc -#%endif - %changelog +* Sun May 10 2020 Silvan Calarco 2.40.0-1mamba +- update to 2.40.0 + * Fri Feb 09 2018 Silvan Calarco 2.36.9-2mamba - rebuilt to try to fix warning on libpng linking @@ -402,5 +351,5 @@ fi - fixed underquoted m4 definition - HTML documentation moved to devel package -* Mon Oct 07 2003 Silvan Calarco 0.22.0-1qilnx +* Tue Oct 07 2003 Silvan Calarco 0.22.0-1qilnx - first build