Hello community,
here is the log from the commit of package kdebase3-SuSE for openSUSE:Factory
checked in at 2012-01-24 12:18:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase3-SuSE (Old)
and /work/SRC/openSUSE:Factory/.kdebase3-SuSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase3-SuSE", Maintainer is "kde-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase3-SuSE/kdebase3-SuSE.changes
2011-12-25 17:35:26.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdebase3-SuSE.new/kdebase3-SuSE.changes
2012-01-24 12:18:50.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Jan 12 21:04:59 UTC 2012 - an...@opensuse.org
+
+- use libpng14
+- disable ksplashx for openSUSE > 12.1 (can be reenabled it there is need)
+
+-------------------------------------------------------------------
New:
----
kdebase3-suse-libpng14.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3-SuSE.spec ++++++
--- /var/tmp/diff_new_pack.k8CZZC/_old 2012-01-24 12:18:51.000000000 +0100
+++ /var/tmp/diff_new_pack.k8CZZC/_new 2012-01-24 12:18:51.000000000 +0100
@@ -27,8 +27,8 @@
BuildRequires: ImageMagick db-devel dbus-1-qt3-devel desktop-data-openSUSE
BuildRequires: hwinfo-devel kdebase3-devel libelf-devel lzma-alpha-devel
rpm-devel yast2 yast2-theme-openSUSE
BuildRequires: kdebase3 > 3.5.1
-%if %suse_version > 1120
-BuildRequires: libpng12-compat-devel
+%if %suse_version <= 1210
+BuildRequires: libpng14-compat-devel
%endif
%if %with_hal == 1
BuildRequires: hal-devel
@@ -62,6 +62,7 @@
Patch0: adjust-settings.patch
Patch1: branding-12_1.patch
Patch2: kwin-show-desktop.patch
+Patch3: kdebase3-suse-libpng14.patch
%description
This package contains the standard SUSE desktop and menu extensions for
@@ -108,6 +109,11 @@
%patch1 -p1
%endif
%patch2 -p1
+%if %suse_version <= 1210
+%patch3 -p1
+%else
+rm -rf ksplashx
+%endif
update_admin
@@ -189,8 +195,11 @@
/opt/kde3/bin/kde_add_yast_source.sh
/opt/kde3/bin/kde_iso_mount
/opt/kde3/bin/kfiledialog
+%if %suse_version <= 1210
/opt/kde3/bin/ksplashx
/opt/kde3/bin/ksplashx_scale
+/opt/kde3/share/apps/ksplash
+%endif
/opt/kde3/bin/publish_item
/opt/kde3/bin/startkde.pick_wallpaper
/opt/kde3/bin/startkde.theme
@@ -207,7 +216,6 @@
/opt/kde3/share/applications/kde/konqfilemgr_rpm.desktop
/opt/kde3/share/apps/kthememanager
/opt/kde3/share/apps/kicker/wallpapers/SuSE.png
-/opt/kde3/share/apps/ksplash
/opt/kde3/share/apps/krpmview
/opt/kde3/share/applnk/.hidden/kdeymp.desktop
/opt/kde3/share/applnk/.hidden/kdeymu.desktop
++++++ kdebase3-suse-libpng14.patch ++++++
diff -wruN kdebase-SuSE.orig/ksplashx/qpngio.cpp
kdebase-SuSE/ksplashx/qpngio.cpp
--- kdebase-SuSE.orig/ksplashx/qpngio.cpp 2005-01-12 16:05:09.000000000
+0300
+++ kdebase-SuSE/ksplashx/qpngio.cpp 2012-01-12 18:23:51.287280932 +0400
@@ -141,7 +141,7 @@
image.setColor( i, qRgba(c,c,c,0xff) );
}
if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
- const int g = info_ptr->trans_values.gray;
+ const int g = info_ptr->trans_color.gray;
if (g < ncols) {
image.setAlphaBuffer(TRUE);
image.setColor(g, image.color(g) & RGB_MASK);
@@ -169,7 +169,7 @@
info_ptr->palette[i].red,
info_ptr->palette[i].green,
info_ptr->palette[i].blue,
- info_ptr->trans[i]
+ info_ptr->trans_alpha[i]
)
);
i++;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
