summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mageia/dependencies/qt3/qt3.spec28
-rw-r--r--redhat/applications/digikam/trinity-digikam-3.5.13-sru.spec4
-rw-r--r--redhat/applications/gtk-qt-engine/trinity-gtk-qt-engine.spec16
-rw-r--r--redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec12
-rw-r--r--redhat/dependencies/libcaldav/libcaldav.spec2
-rw-r--r--redhat/dependencies/libcarddav/libcarddav.spec2
-rw-r--r--redhat/dependencies/qt3/qt3-3.3.8.d-fix_png15_support.patch (renamed from redhat/dependencies/qt3/1326063972:e278b858739babff5cc19ca81a661e1256d162e7.diff)0
-rw-r--r--redhat/dependencies/qt3/qt3-3.3.8.d.spec2
-rw-r--r--redhat/extras/ksensors/ksensors-0.7.3-trinity.patch2
-rw-r--r--redhat/extras/trinity-desktop/trinity-desktop.spec1
-rw-r--r--redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec2
-rwxr-xr-xredhat/kdelibs/trinity-kdelibs-3.5.13.spec5
12 files changed, 55 insertions, 21 deletions
diff --git a/mageia/dependencies/qt3/qt3.spec b/mageia/dependencies/qt3/qt3.spec
index bb109270a..35880ce47 100644
--- a/mageia/dependencies/qt3/qt3.spec
+++ b/mageia/dependencies/qt3/qt3.spec
@@ -27,7 +27,7 @@
Name: qt3
Version: 3.3.8.d
-Release: %mkrel 1%{?dist}
+Release: %mkrel 2%{?dist}
License: GPLv3+ and QPL
Summary: Qt3 Sources
Group: System/Libraries
@@ -65,11 +65,19 @@ Patch59: qt-3.3.6-fix-qfile-message-error2.patch
Patch63: qt-x11-free-3.3.8-qmo35263.patch
Patch64: qt-x11-free-3.3.8b-unixodb-64.patch
Patch65: qt-x11-free-3.3.8b-cstddef.patch
-Patch66: qt-x11-free-3.3.8b-force-png12.patch
+#Patch66: qt-x11-free-3.3.8b-force-png12.patch
#-------------- KDE qt-copy patches ( added the relevant ones )
Patch102: 0017-qiconview-ctrl_rubber.patch
Patch104: 0035-qvaluelist-streaming-operator.patch
Patch115: 0078-argb-visual-hack.patch
+
+# TDE 3.5.13 patches
+Patch300: qt3-3.3.8.d-updates_zh-tw_translations.patch
+
+## [qt3] Fix Qt3 builds with libpng15. [Bug #683]
+Patch301: qt3-3.3.8.d-fix_png15_support.patch
+
+
Buildroot: %_tmppath/%name-%version-%release-root
%if %buildSQL
BuildRequires: mysql-devel
@@ -92,7 +100,8 @@ BuildRequires: fontconfig-devel
BuildRequires: bzip2-devel
BuildRequires: libjpeg-devel
BuildRequires: libmng-devel
-BuildRequires: pkgconfig(libpng12)
+#BuildRequires: pkgconfig(libpng12)
+BuildRequires: pkgconfig(libpng15)
BuildRequires: zlib-devel
BuildRequires: nas-devel
BuildRequires: libiodbc-devel
@@ -483,12 +492,17 @@ find %_docdir -maxdepth 1 -type d -name qt-3.\* -exec rm -rf {} \;
%patch64 -p0 -b .fix_unixodbc
%endif
%patch65 -p1 -b .gcc46
-%patch66 -p0 -b .libpng
+#patch66 -p0 -b .libpng
# KDE qt-copy patches
%patch102 -p0 -b .qt-copy
%patch104 -p0 -b .qt-copy
%patch115 -p0 -b .qt-copy
+# TDE 3.5.13 patches
+%patch300 -p1
+%patch301 -p1
+
+
# (Anssi 01/2008)
# Hack to disable stripping, a better fix for configure script welcome:
mkdir -p stripbin
@@ -525,7 +539,7 @@ echo "yes" | ./configure \
-I/usr/include/Xft2 \
-I/usr/include/Xft2/X11/Xft \
-I/usr/include/mysql/ \
- -I/usr/include/libpng12 \
+ -I/usr/include/libpng15 \
-prefix %qtdir/ \
-libdir %_libdir \
-plugindir %{plugindir} \
@@ -783,6 +797,10 @@ rm -fr %buildroot
%changelog
+* Mon Aug 27 2012 Francois Andriot <francois.andriot@free.fr> 3.3.8.d-2
+- Rebuild with libpng 1.5
+- Updates zh_TW translations
+
* Sat Jul 27 2012 Francois Andriot <francois.andriot@free.fr> 3.3.8.d-1
- Initial build for MGA2
diff --git a/redhat/applications/digikam/trinity-digikam-3.5.13-sru.spec b/redhat/applications/digikam/trinity-digikam-3.5.13-sru.spec
index b9ac5ae96..9a1031d72 100644
--- a/redhat/applications/digikam/trinity-digikam-3.5.13-sru.spec
+++ b/redhat/applications/digikam/trinity-digikam-3.5.13-sru.spec
@@ -25,7 +25,7 @@
Name: trinity-%{kdecomp}
Summary: digital photo management application for KDE [Trinity]
Version: 0.9.6
-Release: 3%{?dist}%{?_variant}
+Release: 4%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -300,6 +300,6 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
%Changelog
-* Wed Aug 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-3
+* Wed Aug 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-4
- Switch to v3.5.13-sru branch.
diff --git a/redhat/applications/gtk-qt-engine/trinity-gtk-qt-engine.spec b/redhat/applications/gtk-qt-engine/trinity-gtk-qt-engine.spec
index 7456ffd9d..409e4c706 100644
--- a/redhat/applications/gtk-qt-engine/trinity-gtk-qt-engine.spec
+++ b/redhat/applications/gtk-qt-engine/trinity-gtk-qt-engine.spec
@@ -26,7 +26,7 @@
Name: trinity-%{kdecomp}
Summary: theme engine using Qt for GTK+ 2.x and Trinity
Version: 0.8
-Release: 2%{?dist}%{?_variant}
+Release: 3%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -39,6 +39,9 @@ Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.tar.gz
+Source1: gtk-qt-engine.rc.sh
+Source2: gtkrc-2.0-kde4
+Source3: gtkrc-2.0-kde-kde4
# [gtk-qt-engine] Fix inclusion of 'glib.h'
Patch1: gtk-qt-engine-3.5.13-fix_glib_include.patch
@@ -104,6 +107,11 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{kdecomp}
+# Adds TDE's specific GTKRC
+%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh
+%__install -D -m 644 %{SOURCE2} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde4
+%__install -D -m 644 %{SOURCE3} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4
+
%clean
%__rm -rf %{buildroot}
@@ -115,6 +123,9 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_tdelibdir}/kcm_kcmgtk.la
%{tde_tdelibdir}/kcm_kcmgtk.so
%{tde_appdir}/kcmgtk.desktop
+%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh
+%{tde_datadir}/kgtk/.gtkrc-2.0-kde4
+%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4
# The following files are outside TDE's directory
%{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.so
@@ -122,6 +133,9 @@ export PATH="%{tde_bindir}:${PATH}"
%Changelog
+* Mon Aug 27 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3
+- Add missing gtkrc files
+
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-2
- Rebuilt for Fedora 17
- Fix FTBFS with newer glib
diff --git a/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec b/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec
index 3163d1b58..d0f1e46c6 100644
--- a/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec
+++ b/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec
@@ -26,7 +26,7 @@
Name: trinity-%{kdecomp}
Summary: Use KDE dialogs in Gtk apps
Version: 0.10.2
-Release: 2%{?dist}%{?_variant}
+Release: 3%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -102,8 +102,11 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
+# The "preload" file is used by "startkde" script
+%__install -d -m 755 "%{buildroot}%{tde_datadir}/kgtk"
+echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload"
-%find_lang kdialogd3 || touch %{kdecomp}.lang
+%find_lang kdialogd3
@@ -121,9 +124,12 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_bindir}/kqt3-wrapper
%{tde_libdir}/kgtk/libkgtk2.so
%{tde_libdir}/kgtk/libkqt3.so
-
+%{tde_datadir}/kgtk/preload
%Changelog
+* Sun Aug 26 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-3
+- Add 'preload' file for startkde script
+
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-2
- Rebuilt for Fedora 17
- Removes post and postun
diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec
index 55d1fd70b..9374a2fe6 100644
--- a/redhat/dependencies/libcaldav/libcaldav.spec
+++ b/redhat/dependencies/libcaldav/libcaldav.spec
@@ -83,6 +83,7 @@ autoreconf --force --install --symlink
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
+%__rm -f %{buildroot}%{tde_libdir}/*.a
%clean
%__rm -rf %{buildroot}
@@ -94,7 +95,6 @@ autoreconf --force --install --symlink
%files devel
%{tde_includedir}/caldav.h
-%{tde_libdir}/*.a
%{tde_libdir}/*.la
%{tde_libdir}/*.so
%{tde_libdir}/pkgconfig/libcaldav.pc
diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec
index 003bcb9af..2c396ede1 100644
--- a/redhat/dependencies/libcarddav/libcarddav.spec
+++ b/redhat/dependencies/libcarddav/libcarddav.spec
@@ -76,6 +76,7 @@ autoreconf --force --install --symlink
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} LIBTOOL=$(which libtool)
+%__rm -f %{buidroot}%{tde_libdir}/*.a
%clean
%__rm -rf %{buildroot}
@@ -86,7 +87,6 @@ autoreconf --force --install --symlink
%files devel
%{tde_includedir}/*.h
-%{tde_libdir}/*.a
%{tde_libdir}/*.la
%{tde_libdir}/*.so
%{tde_libdir}/pkgconfig/libcarddav.pc
diff --git a/redhat/dependencies/qt3/1326063972:e278b858739babff5cc19ca81a661e1256d162e7.diff b/redhat/dependencies/qt3/qt3-3.3.8.d-fix_png15_support.patch
index c8987d66b..c8987d66b 100644
--- a/redhat/dependencies/qt3/1326063972:e278b858739babff5cc19ca81a661e1256d162e7.diff
+++ b/redhat/dependencies/qt3/qt3-3.3.8.d-fix_png15_support.patch
diff --git a/redhat/dependencies/qt3/qt3-3.3.8.d.spec b/redhat/dependencies/qt3/qt3-3.3.8.d.spec
index 53f53e976..4c39df0cc 100644
--- a/redhat/dependencies/qt3/qt3-3.3.8.d.spec
+++ b/redhat/dependencies/qt3/qt3-3.3.8.d.spec
@@ -88,7 +88,7 @@ Patch200: qt-x11-free-3.3.4-fullscreen.patch
Patch300: qt3-3.3.8.d-updates_zh-tw_translations.patch
## [qt3] Fix Qt3 builds with libpng15. [Bug #683]
-Patch301: 1326063972:e278b858739babff5cc19ca81a661e1256d162e7.diff
+Patch301: qt3-3.3.8.d-fix_png15_support.patch
%define qt_dirname qt-3.3
%define qtdir %{_libdir}/%{qt_dirname}
diff --git a/redhat/extras/ksensors/ksensors-0.7.3-trinity.patch b/redhat/extras/ksensors/ksensors-0.7.3-trinity.patch
index 9f6a3a6d7..94ba77c79 100644
--- a/redhat/extras/ksensors/ksensors-0.7.3-trinity.patch
+++ b/redhat/extras/ksensors/ksensors-0.7.3-trinity.patch
@@ -6,7 +6,7 @@ diff -Nuar ksensors-0.7.3.ORI//configure ksensors-0.7.3.P//configure
if test -z ""; then
-kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
-+kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
++kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/trinity/include/kde $x_includes $qt_includes"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs"
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index 53fdbdf15..f8124f641 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -107,6 +107,7 @@ Requires: trinity-kcmautostart
Requires: trinity-kcpuload
Requires: trinity-kdbusnotification
Requires: trinity-guidance
+Requires: trinity-guidance-powermanager
Requires: trinity-style-lipstik
Requires: trinity-style-qtcurve
Requires: trinity-systemsettings
diff --git a/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec b/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec
index 00debd329..10ae89f38 100644
--- a/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec
+++ b/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec
@@ -570,7 +570,7 @@ This package is part of Trinity, and a component of the TDE artwork module.
%{tde_datadir}/applnk/System/ScreenSavers/zoom.desktop
# These screensavers do not exist on Mageia 2 and Mandriva 2011
-%if 0%{?mgaversion} == 0 && 0%{mdkversion}==0
+%if 0%{?mgaversion} == 0 && 0%{?mdkversion} == 0
%{tde_datadir}/applnk/System/ScreenSavers/xjack.desktop
%{tde_datadir}/applnk/System/ScreenSavers/xmatrix.desktop
%endif
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
index 2e9004514..6f861db77 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
@@ -81,8 +81,6 @@ Patch28: kdelibs-3.5.13-fix_build_kspell2.patch
Patch29: kdelibs-3.5.13-fix_iso_kioslave.patch
## [tdelibs] Fix iso kioslave not parsing large images properly [Commit #b4bba7b5]
Patch30: kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch
-## [tdelibs] Add ability to set KLed off color [Commit #513ffc6e]
-Patch31: kdelibs-3.5.13-add_ability_to_set_kled_off_color.patch
## [tdelibs] Fix spinbox text entry when base is not 10 [Commit #d1c71f69]
Patch32: kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch
## [tdelibs] Update iso kioslave to better handle large images [Commit #dca4c677]
@@ -333,9 +331,6 @@ applications for TDE.
%patch28 -p1
%patch29 -p1
%patch30 -p1
-%if 0%{?mdkversion} || 0%{?mgaversion}
-%patch31 -p1 -b .kled
-%endif
%patch32 -p1
%patch33 -p1
%patch34 -p1
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-20 16:06:26 +0000