diff options
Diffstat (limited to 'redhat')
56 files changed, 978 insertions, 4614 deletions
diff --git a/redhat/applications/basket/basket-14.0.0.spec b/redhat/applications/basket/basket-14.0.0.spec index a4e1a7b8a..2005d20e4 100644 --- a/redhat/applications/basket/basket-14.0.0.spec +++ b/redhat/applications/basket/basket-14.0.0.spec @@ -138,7 +138,6 @@ export PATH="%{tde_bindir}:${PATH}" %suse_update_desktop_file -G "Extended Clipboard" basket DesktopUtility %endif - # Apps that should stay in TDE echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" diff --git a/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec b/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec index 3872b21ce..5a321aba0 100644 --- a/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec +++ b/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec @@ -75,10 +75,7 @@ BuildRequires: brp-check-trinity %description -KKBSwitch displays an icon in the system tray that indicates which -layout is KLcdDimmer is applet for simple adjust LCD brightness. -Notice that this applet relies on an external program to get/set the -brightness. + ########## diff --git a/redhat/applications/kmplayer/kmplayer-14.0.0.patch b/redhat/applications/kmplayer/kmplayer-14.0.0.patch new file mode 100644 index 000000000..fba761b15 --- /dev/null +++ b/redhat/applications/kmplayer/kmplayer-14.0.0.patch @@ -0,0 +1,13 @@ +diff --git a/src/gstplayer.cpp b/src/gstplayer.cpp +index c4bf580..0585ac9 100644 +--- a/src/gstplayer.cpp ++++ b/src/gstplayer.cpp +@@ -750,7 +750,7 @@ void KGStreamerPlayer::seek (int val /*offset_in_deciseconds*/) { + void KGStreamerPlayer::volume (int val) { + //fprintf (stderr, "position %d\n", val); + if (gst_elm_play) +- g_object_set (G_OBJECT (gst_elm_play), "volume", 1.0*val/100, 0L); ++ g_object_set (G_OBJECT (gst_elm_play), "volume", 1.0*val/100, NULL); + } + + void KGStreamerPlayer::updatePosition () { diff --git a/redhat/applications/kmplayer/kmplayer-14.0.0.spec b/redhat/applications/kmplayer/kmplayer-14.0.0.spec index 9425c3f6e..c958753b0 100644 --- a/redhat/applications/kmplayer/kmplayer-14.0.0.spec +++ b/redhat/applications/kmplayer/kmplayer-14.0.0.spec @@ -1,52 +1,80 @@ -# Default version for this component -%define tde_pkg kmplayer +# +# spec file for package kmplayer (version R14.0.0) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE specific building variables +%define tde_pkg kmplayer +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: media player for Trinity -Version: 0.10.0c -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.10.0c +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Summary: Media player for Trinity +Group: Applications/Multimedia +URL: http://www.trinitydesktop.org/ +#URL: http://kmplayer.kde.org -License: GPLv2+ -Group: Applications/Multimedia +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://kmplayer.kde.org +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Patch0: %{tde_pkg}-%{tde_version}.patch -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + # DBUS support %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} BuildRequires: trinity-dbus-tqt-devel >= %{tde_version} @@ -119,6 +147,7 @@ BuildRequires: dbus-glib-devel Requires: %{name}-base = %{version}-%{release} + %description A basic audio/video viewer application for Trinity. @@ -135,6 +164,30 @@ KMPlayer can: * Lots of configurable shortcuts. Highly recommended for the VDR keys (if you have VDR) and volume increase/decrease +%post +/sbin/ldconfig || : + +%postun +/sbin/ldconfig || : + +%files -f %{tde_pkg}.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm +%{tde_bindir}/kmplayer +%{tde_bindir}/knpplayer +%{tde_bindir}/kxvplayer +%{tde_libdir}/libtdeinit_kmplayer.la +%{tde_libdir}/libtdeinit_kmplayer.so +%{tde_tdelibdir}/kmplayer.la +%{tde_tdelibdir}/kmplayer.so +%{tde_tdeappdir}/kmplayer.desktop +%exclude %{tde_datadir}/apps/kmplayer/bookmarks.xml +%exclude %{tde_datadir}/apps/kmplayer/kmplayerpartui.rc +%exclude %{tde_datadir}/apps/kmplayer/noise.gif +%exclude %{tde_datadir}/apps/kmplayer/pluginsinfo +%{tde_datadir}/apps/kmplayer/ + +########## %package base Group: Applications/Multimedia @@ -143,11 +196,36 @@ Summary: Base files for KMPlayer [Trinity] %description base Core files needed for KMPlayer. +%post base +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : +/sbin/ldconfig || : + +%postun base +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : +/sbin/ldconfig || : + +%files base +%defattr(-,root,root,-) +%{tde_libdir}/libkmplayercommon.la +%{tde_libdir}/libkmplayercommon.so +%{tde_bindir}/kgstplayer +%{tde_bindir}/kxineplayer +%{tde_datadir}/config/kmplayerrc +%{tde_datadir}/apps/kmplayer/bookmarks.xml +%{tde_datadir}/apps/kmplayer/noise.gif +%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png +%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz +%{tde_datadir}/mimelnk/application/x-kmplayer.desktop +%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop + +########## %package konq-plugins Group: Applications/Multimedia Requires: %{name}-base = %{version}-%{release} -Requires: trinity-tdebase >= %{tde_version} +Requires: trinity-konqueror >= %{tde_version} Summary: KMPlayer plugin for KHTML/Konqueror [Trinity] %description konq-plugins @@ -156,6 +234,15 @@ This plugin enables audio/video playback inside konqueror, using Xine (with tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin browser plugins. +%files konq-plugins +%defattr(-,root,root,-) +%{tde_tdelibdir}/libkmplayerpart.la +%{tde_tdelibdir}/libkmplayerpart.so +%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc +%{tde_datadir}/apps/kmplayer/pluginsinfo +%{tde_datadir}/services/kmplayer_part.desktop + +########## %package doc Group: Applications/Multimedia @@ -165,14 +252,21 @@ Summary: Handbook for KMPlayer [Trinity] %description doc Documention for KMPlayer, a basic audio/video viewer application for TDE. +%files doc +%defattr(-,root,root,-) +%{tde_tdedocdir}/HTML/*/kmplayer + +########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%patch0 -p1 -b .orig %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -214,70 +308,16 @@ export PATH="%{tde_bindir}:${PATH}" # Removes unwanted files %__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -r "%{tde_pkg}" TDE AudioVideo Player Video +%endif + %clean %__rm -rf %{buildroot} -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - -%post base -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig || : - -%postun base -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm -%{tde_bindir}/kmplayer -%{tde_bindir}/knpplayer -%{tde_bindir}/kxvplayer -%{tde_libdir}/libtdeinit_kmplayer.la -%{tde_libdir}/libtdeinit_kmplayer.so -%{tde_tdelibdir}/kmplayer.la -%{tde_tdelibdir}/kmplayer.so -%{tde_tdeappdir}/kmplayer.desktop -%{tde_datadir}/apps/kmplayer -%{tde_datadir}/services/kmplayer_part.desktop - -%files base -%defattr(-,root,root,-) -%{tde_libdir}/libkmplayercommon.la -%{tde_libdir}/libkmplayercommon.so -%{tde_bindir}/kgstplayer -%{tde_bindir}/kxineplayer -%{tde_datadir}/config/kmplayerrc -%{tde_datadir}/apps/kmplayer/bookmarks.xml -%{tde_datadir}/apps/kmplayer/noise.gif -%{tde_datadir}/apps/kmplayer/pluginsinfo -%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png -%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz -%{tde_datadir}/mimelnk/application/x-kmplayer.desktop -%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop - -%files doc -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/*/kmplayer - -%files konq-plugins -%defattr(-,root,root,-) -%{tde_tdelibdir}/libkmplayerpart.la -%{tde_tdelibdir}/libkmplayerpart.so -%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc -%{tde_datadir}/apps/kmplayer/pluginsinfo -%{tde_datadir}/services/kmplayer_part.desktop - - %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-8 +* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.10.0c-1 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kmplayer/kmplayer-3.5.13-fix_gcc47_compilation.patch deleted file mode 100644 index 02962e256..000000000 --- a/redhat/applications/kmplayer/kmplayer-3.5.13-fix_gcc47_compilation.patch +++ /dev/null @@ -1,45 +0,0 @@ -commit 5106117b5c1439d3fee08395c1a025f62d30a53e -Author: Darrell Anderson <humanreadable@yahoo.com> -Date: 1335631986 -0500 - - GCC 4.7 fixes. - -diff --git a/src/gstplayer.cpp b/src/gstplayer.cpp -index ebf7b0d..c4bf580 100644 ---- a/src/gstplayer.cpp -+++ b/src/gstplayer.cpp -@@ -1003,11 +1003,16 @@ int main(int argc, char **argv) { - gstapp->exec (); - - XLockDisplay(display); -- XClientMessageEvent ev = { -- ClientMessage, 0, true, display, wid, -- XInternAtom (display, "XVIDEO", false), 8, {b: "quit_now"} -- }; -- XSendEvent (display, wid, false, StructureNotifyMask, (XEvent *) & ev); -+ XEvent ev; -+ ev.xclient.type = ClientMessage; -+ ev.xclient.serial = 0; -+ ev.xclient.send_event = true; -+ ev.xclient.display = display; -+ ev.xclient.window = wid; -+ ev.xclient.message_type = XInternAtom (display, "XVIDEO", false); -+ ev.xclient.format = 8; -+ strcpy(ev.xclient.data.b, "quit_now"); -+ XSendEvent (display, wid, false, StructureNotifyMask, &ev); - XFlush (display); - XUnlockDisplay(display); - eventThread->wait (500); -diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp -index 27b26cd..bdeac91 100644 ---- a/src/kmplayerapp.cpp -+++ b/src/kmplayerapp.cpp -@@ -17,6 +17,8 @@ - - #undef Always - -+#include <unistd.h> -+ - // include files for QT - #include <tqdatastream.h> - #include <tqregexp.h> diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13-missing_ldflags.patch b/redhat/applications/kmplayer/kmplayer-3.5.13-missing_ldflags.patch deleted file mode 100644 index ba6c16cb9..000000000 --- a/redhat/applications/kmplayer/kmplayer-3.5.13-missing_ldflags.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- kmplayer/src/Makefile.am.ORI 2012-08-05 17:09:59.963896862 +0200 -+++ kmplayer/src/Makefile.am 2012-08-05 17:10:16.667563785 +0200 -@@ -6,7 +6,7 @@ - - libkmplayercommon_la_SOURCES = viewarea.cpp kmplayerview.cpp playlistview.cpp kmplayercontrolpanel.cpp kmplayerconfig.cpp pref.cpp kmplayerprocess.cpp kmplayer_callback.skel kmplayer_backend.stub kmplayerpartbase.cpp kmplayerplaylist.cpp kmplayer_asx.cpp kmplayer_smil.cpp kmplayer_rp.cpp kmplayer_rss.cpp kmplayer_atom.cpp kmplayer_xspf.cpp triestring.cpp kmplayerpartbase.skel - libkmplayercommon_la_LDFLAGS = -avoid-version $(all_libraries) --libkmplayercommon_la_LIBADD = -lkmediaplayer $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_EXPAT) -lm $(LIBCAIRO_LIBS) $(LIBQTDBUS) -+libkmplayercommon_la_LIBADD = -lkmediaplayer $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_EXPAT) -lm $(LIBCAIRO_LIBS) $(LIBQTDBUS) $(LIB_QT) -lDCOP $(LIB_KDECORE) -lkdefx $(LIB_KDEUI) $(LIB_KIO) - - if include_koffice_support - kofficeplugin_lib= libkmplayerkofficepart.la ---- kmplayer/src/Makefile.am.ORI 2011-12-03 23:22:01.601981533 +0100 -+++ kmplayer/src/Makefile.am 2011-12-03 23:22:44.469655046 +0100 -@@ -58,6 +58,7 @@ - kgstplayer_SOURCES= gstplayer.cpp - - knpplayer_LDADD= $(LIBNSPR_LIBS) -+knpplayer_LDFLAGS= -lX11 -lgmodule-2.0 - knpplayer_SOURCES= npplayer.c - - xdg_apps_DATA = kmplayer.desktop diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.1-fix_xine12_support.patch b/redhat/applications/kmplayer/kmplayer-3.5.13.1-fix_xine12_support.patch deleted file mode 100644 index 1dd604c1a..000000000 --- a/redhat/applications/kmplayer/kmplayer-3.5.13.1-fix_xine12_support.patch +++ /dev/null @@ -1,112 +0,0 @@ -Index: b/src/xineplayer.cpp -=================================================================== ---- a/src/xineplayer.cpp 2012-10-30 18:39:16.000000000 +0000 -+++ b/src/xineplayer.cpp 2012-11-03 17:56:01.760234144 +0000 -@@ -528,7 +528,11 @@ - xine_event_create_listener_thread (event_queue, event_listener, NULL); - if (mrl == "cdda:/") { - int nr; -+#if XINE_MAJOR_VERSION > 1 || ( XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2 ) -+ const char * const* mrls = xine_get_autoplay_mrls (xine, "CD", &nr); -+#else - char ** mrls = xine_get_autoplay_mrls (xine, "CD", &nr); -+#endif - running = 1; - for (int i = 0; i < nr; i++) { - TQString m (mrls[i]); -@@ -863,10 +867,10 @@ - case XK_p: // previous - mutex.lock (); - if (stream) { -- xine_event_t xine_event = { -- XINE_EVENT_INPUT_PREVIOUS, -- stream, 0L, 0, { 0, 0 } -- }; -+ xine_event_t xine_event; -+ memset(&xine_event, 0, sizeof(xine_event)); -+ xine_event.type = XINE_EVENT_INPUT_PREVIOUS; -+ xine_event.stream = stream; - xine_event_send (stream, &xine_event); - } - mutex.unlock (); -@@ -875,10 +879,10 @@ - case XK_n: // next - mutex.lock (); - if (stream) { -- xine_event_t xine_event = { -- XINE_EVENT_INPUT_NEXT, -- stream, 0L, 0, { 0, 0 } -- }; -+ xine_event_t xine_event; -+ memset(&xine_event, 0, sizeof(xine_event)); -+ xine_event.type = XINE_EVENT_INPUT_NEXT; -+ xine_event.stream = stream; - xine_event_send (stream, &xine_event); - } - mutex.unlock (); -@@ -887,10 +891,10 @@ - case XK_u: // up menu - mutex.lock (); - if (stream) { -- xine_event_t xine_event = { -- XINE_EVENT_INPUT_MENU1, -- stream, 0L, 0, { 0, 0 } -- }; -+ xine_event_t xine_event; -+ memset(&xine_event, 0, sizeof(xine_event)); -+ xine_event.type = XINE_EVENT_INPUT_MENU1; -+ xine_event.stream = stream; - xine_event_send (stream, &xine_event); - } - mutex.unlock (); -@@ -899,10 +903,10 @@ - case XK_r: // root menu - mutex.lock (); - if (stream) { -- xine_event_t xine_event = { -- XINE_EVENT_INPUT_MENU3, -- stream, 0L, 0, { 0, 0 } -- }; -+ xine_event_t xine_event; -+ memset(&xine_event, 0, sizeof(xine_event)); -+ xine_event.type = XINE_EVENT_INPUT_MENU3; -+ xine_event.stream = stream; - xine_event_send (stream, &xine_event); - } - mutex.unlock (); -@@ -985,11 +989,12 @@ - data.x = rect.x; - data.y = rect.y; - data.button = 0; -- xine_event_t xine_event = { -- XINE_EVENT_INPUT_MOUSE_MOVE, -- stream, &data, sizeof (xine_input_data_t), -- { 0 , 0 } -- }; -+ xine_event_t xine_event; -+ memset(&xine_event, 0, sizeof(xine_event)); -+ xine_event.type = XINE_EVENT_INPUT_MOUSE_MOVE; -+ xine_event.stream = stream; -+ xine_event.data = &data; -+ xine_event.data_length = sizeof (xine_input_data_t); - mutex.lock (); - xine_event_send (stream, &xine_event); - mutex.unlock (); -@@ -1023,11 +1028,12 @@ - data.x = rect.x; - data.y = rect.y; - data.button = 1; -- xine_event_t xine_event = { -- XINE_EVENT_INPUT_MOUSE_BUTTON, -- stream, &data, sizeof (xine_input_data_t), -- { 0, 0 } -- }; -+ xine_event_t xine_event; -+ memset(&xine_event, 0, sizeof(xine_event)); -+ xine_event.type = XINE_EVENT_INPUT_MOUSE_BUTTON; -+ xine_event.stream = stream; -+ xine_event.data = &data; -+ xine_event.data_length = sizeof (xine_input_data_t); - mutex.lock (); - xine_event_send (stream, &xine_event); - mutex.unlock (); diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.1.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.1.spec deleted file mode 100644 index e01ee9a36..000000000 --- a/redhat/applications/kmplayer/kmplayer-3.5.13.1.spec +++ /dev/null @@ -1,247 +0,0 @@ -# Default version for this component -%define kdecomp kmplayer - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: media player for Trinity -Version: 0.10.0c -Release: 4%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://kmplayer.kde.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz - -# [kmplayer] Fix xine 1.2 support -Patch1: kmplayer-3.5.13.1-fix_xine12_support.patch - - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-dbus-tqt-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdebase-devel >= 3.5.13.1 -BuildRequires: desktop-file-utils - - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}gstreamer0.10-devel -BuildRequires: %{_lib}gstreamer-plugins-base0.10-devel -BuildRequires: libxv-devel -%endif -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: gstreamer-devel -BuildRequires: gstreamer-plugins-base-devel -BuildRequires: libXv-devel -%endif -%if 0%{?suse_version} -BuildRequires: gstreamer-devel -BuildRequires: gstreamer-0_10-plugins-base-devel -BuildRequires: libXv-devel -%endif - -Requires: %{name}-base - -%description -A basic audio/video viewer application for Trinity. - -KMPlayer can: -* play DVD (DVDNav only with the Xine player) -* play VCD -* let the backend players play from a pipe (read from stdin) -* play from a TV device (experimental) -* show backend player's console output -* launch ffserver (only 0.4.8 works) when viewing from a v4l device -* DCOP KMediaPlayer interface support -* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard KDE - shortcut configure window -* Lots of configurable shortcuts. Highly recommended for the VDR keys - (if you have VDR) and volume increase/decrease - - -%package base -Group: Applications/Multimedia -Summary: Base files for KMPlayer [Trinity] - -%description base -Core files needed for KMPlayer. - - -%package konq-plugins -Group: Applications/Multimedia -Requires: trinity-kmplayer-base, trinity-kdebase -Summary: KMPlayer plugin for KHTML/Konqueror [Trinity] - -%description konq-plugins -This plugin enables audio/video playback inside konqueror, using Xine (with -*kxineplayer) or GStreamer (with *kgstplayer), such as movie trailers, web -tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin -browser plugins. - - -%package doc -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} -Summary: Handbook for KMPlayer [Trinity] - -%description doc -Documention for KMPlayer, a basic audio/video viewer application for KDE. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 -%patch1 -p1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}/dbus-1.0 \ - --enable-closure - - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{kdecomp} - -# Removes unwanted files -%__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop - - -%clean -%__rm -rf %{buildroot} - - -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - -%post base -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig || : - -%postun base -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig || : - - -%files -f %{kdecomp}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm -%{tde_bindir}/kmplayer -%{tde_bindir}/knpplayer -%{tde_bindir}/kxvplayer -%{tde_libdir}/libkdeinit_kmplayer.la -%{tde_libdir}/libkdeinit_kmplayer.so -%{tde_tdelibdir}/kmplayer.la -%{tde_tdelibdir}/kmplayer.so -%{tde_tdeappdir}/kmplayer.desktop -%{tde_datadir}/apps/kmplayer -%{tde_datadir}/services/kmplayer_part.desktop - -%files base -%defattr(-,root,root,-) -%{tde_libdir}/libkmplayercommon.la -%{tde_libdir}/libkmplayercommon.so -%{tde_bindir}/kgstplayer -%{tde_bindir}/kxineplayer -%{tde_datadir}/config/kmplayerrc -%{tde_datadir}/apps/kmplayer/bookmarks.xml -%{tde_datadir}/apps/kmplayer/noise.gif -%{tde_datadir}/apps/kmplayer/pluginsinfo -%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png -%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz -%{tde_datadir}/mimelnk/application/x-kmplayer.desktop -%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop - - -%files doc -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/*/kmplayer - -%files konq-plugins -%defattr(-,root,root,-) -%{tde_tdelibdir}/libkmplayerpart.la -%{tde_tdelibdir}/libkmplayerpart.so -%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc -%{tde_datadir}/apps/kmplayer/pluginsinfo -%{tde_datadir}/services/kmplayer_part.desktop - - -%changelog -* Sat Nov 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-4 -- Fix xine 1.2 support (openSUSE 12.2 only) - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-3 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-2 -- Fix compilation with GCC 4.7 [Commit #5106117b] - -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.spec deleted file mode 100644 index 47248bc5d..000000000 --- a/redhat/applications/kmplayer/kmplayer-3.5.13.spec +++ /dev/null @@ -1,232 +0,0 @@ -# Default version for this component -%define kdecomp kmplayer - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: media player for Trinity -Version: 0.10.0c -Release: 2%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://kmplayer.kde.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz - -# [kmplayer] Fix compilation with GCC 4.7 [Commit #5106117b] -Patch1: kmplayer-3.5.13-fix_gcc47_compilation.patch - -# [kmplayer] Missing LDLFLAGS cause FTBFS -Patch2: kmplayer-3.5.13-missing_ldflags.patch - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils - -BuildRequires: dbus-tqt-devel - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}gstreamer0.10-devel -BuildRequires: %{_lib}gstreamer-plugins-base0.10-devel -BuildRequires: libxv-devel -%else -BuildRequires: gstreamer-devel -BuildRequires: gstreamer-plugins-base-devel -BuildRequires: libXv-devel -%endif - -Requires: %{name}-base - -%description -A basic audio/video viewer application for Trinity. - -KMPlayer can: -* play DVD (DVDNav only with the Xine player) -* play VCD -* let the backend players play from a pipe (read from stdin) -* play from a TV device (experimental) -* show backend player's console output -* launch ffserver (only 0.4.8 works) when viewing from a v4l device -* DCOP KMediaPlayer interface support -* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard KDE - shortcut configure window -* Lots of configurable shortcuts. Highly recommended for the VDR keys - (if you have VDR) and volume increase/decrease - - -%package base -Group: Applications/Multimedia -Summary: Base files for KMPlayer [Trinity] - -%description base -Core files needed for KMPlayer. - - -%package konq-plugins -Group: Applications/Multimedia -Requires: trinity-kmplayer-base, trinity-kdebase -Summary: KMPlayer plugin for KHTML/Konqueror [Trinity] - -%description konq-plugins -This plugin enables audio/video playback inside konqueror, using Xine (with -*kxineplayer) or GStreamer (with *kgstplayer), such as movie trailers, web -tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin -browser plugins. - - -%package doc -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} -Summary: Handbook for KMPlayer [Trinity] - -%description doc -Documention for KMPlayer, a basic audio/video viewer application for KDE. - - -%prep -%setup -q -n applications/%{kdecomp} -%patch1 -p1 -%patch2 -p1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - - -%build -unset QTDIR; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}/dbus-1.0 \ - --enable-closure - - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{kdecomp} - -# Removes unwanted files -%__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop - - -%clean -%__rm -rf %{buildroot} - - -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - -%post base -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig || : - -%postun base -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig || : - - -%files -f %{kdecomp}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm -%{tde_bindir}/kmplayer -%{tde_bindir}/knpplayer -%{tde_bindir}/kxvplayer -%{tde_libdir}/libkdeinit_kmplayer.la -%{tde_libdir}/libkdeinit_kmplayer.so -%{tde_tdelibdir}/kmplayer.la -%{tde_tdelibdir}/kmplayer.so -%{tde_tdeappdir}/kmplayer.desktop -%{tde_datadir}/apps/kmplayer -%{tde_datadir}/services/kmplayer_part.desktop - -%files base -%defattr(-,root,root,-) -%{tde_libdir}/libkmplayercommon.la -%{tde_libdir}/libkmplayercommon.so -%{tde_bindir}/kgstplayer -%{tde_bindir}/kxineplayer -%{tde_datadir}/config/kmplayerrc -%{tde_datadir}/apps/kmplayer/bookmarks.xml -%{tde_datadir}/apps/kmplayer/noise.gif -%{tde_datadir}/apps/kmplayer/pluginsinfo -%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png -%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz -%{tde_datadir}/mimelnk/application/x-kmplayer.desktop -%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop - - -%files doc -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/*/kmplayer - -%files konq-plugins -%defattr(-,root,root,-) -%{tde_tdelibdir}/libkmplayerpart.la -%{tde_tdelibdir}/libkmplayerpart.so -%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc -%{tde_datadir}/apps/kmplayer/pluginsinfo -%{tde_datadir}/services/kmplayer_part.desktop - - -%Changelog -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-2 -- Fix compilation with GCC 4.7 [Commit #5106117b] - -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec b/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec index 2b74b4528..ddb5d72a0 100644 --- a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec +++ b/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec @@ -1,52 +1,78 @@ -# Default version for this component -%define tde_pkg kmyfirewall +# +# spec file for package kmyfirewall (version R14.0.0) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE specific building variables +%define tde_pkg kmyfirewall +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%define _docdir %{tde_docdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.1.1 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Summary: Iptables based firewall configuration tool for TDE +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -Name: trinity-%{tde_pkg} -Summary: iptables based firewall configuration tool for TDE [Trinity] -Version: 1.1.1 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + %description KMyFirewall attempts to make it easier to setup iptables based firewalls on @@ -60,63 +86,8 @@ configure your rule set one time and then you can use it on several computers giving each of them a similar configuration (p.e. school networks, office, university etc.) -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description devel -%{summary} - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility - -%__make %{?_smp_mflags} - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - %post -update-desktop-database %{tde_appdir} > /dev/null +update-desktop-database %{tde_tdeappdir} > /dev/null for f in hicolor locolor; do touch --no-create %{tde_datadir}/icons/${f} || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : @@ -124,14 +95,13 @@ done /sbin/ldconfig || : %postun -update-desktop-database %{tde_appdir} > /dev/null +update-desktop-database %{tde_tdeappdir} > /dev/null for f in hicolor locolor; do touch --no-create %{tde_datadir}/icons/${f} || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : done /sbin/ldconfig || : - %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO @@ -173,10 +143,10 @@ done %{tde_tdelibdir}/libkmfruletargetoptionedit_tos.la %{tde_tdelibdir}/libkmfruletargetoptionedit_tos.so %{tde_tdeappdir}/kmyfirewall.desktop -%{tde_datadir}/apps/kmfgenericinterfacepart/kmfgenericinterfacepartui.rc -%{tde_datadir}/apps/kmfipteditorpart/kmfipteditorpartui.rc -%{tde_datadir}/apps/kmfsystray -%{tde_datadir}/apps/kmyfirewall +%{tde_datadir}/apps/kmfgenericinterfacepart/ +%{tde_datadir}/apps/kmfipteditorpart/ +%{tde_datadir}/apps/kmfsystray/ +%{tde_datadir}/apps/kmyfirewall/ %{tde_datadir}/config.kcfg/kmfconfig.kcfg %{tde_datadir}/config/kmyfirewallrc %{tde_tdedocdir}/HTML/en/kmyfirewall/ @@ -189,6 +159,16 @@ done %{tde_datadir}/services/kmf*.desktop %{tde_datadir}/servicetypes/kmf*.desktop +########## + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +%{summary} + %files devel %{tde_tdeincludedir}/kmyfirewall %{tde_libdir}/libkmfcore.la @@ -196,6 +176,62 @@ done %{tde_libdir}/libkmfwidgets.la %{tde_libdir}/libkmfwidgets.so +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## + + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --libdir=%{tde_libdir} \ + --mandir=%{tde_mandir} \ + --includedir=%{tde_tdeincludedir} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath \ + --disable-gcc-hidden-visibility + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -r "%{tde_pkg}" System Network +%endif + + +%clean +%__rm -rf %{buildroot} + + %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.1.1-6 +* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.1.1-1 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-fix_gcc47_compilation.patch deleted file mode 100644 index 4daf67e9b..000000000 --- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-fix_gcc47_compilation.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- ./kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp.orig 2012-05-02 04:58:04.051212974 -0400 -+++ ./kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp 2012-05-02 05:07:11.093803088 -0400 -@@ -305,14 +305,15 @@ - if ( m_zone && ! m_host ) { - if ( onOff ) { - m_protocolUsage = 0; -- if ( KMFProtocolUsage* pro = m_zone->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) { -+ KMFProtocolUsage* pro; -+ if ( pro = m_zone->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) { - m_protocolUsage = pro; - } else { - KMFUndoEngine::instance()->startTransaction( - m_zone, - i18n("Add protocol %1 to zone %2.").tqarg( protUsage->protocol()->name() ).tqarg( m_zone->guiName() ) - ); -- KMFProtocolUsage * pro = m_zone->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol()->getDOMTree() ); -+ pro = m_zone->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol()->getDOMTree() ); - - if ( pro ) { - kdDebug() << "Added Protocol to zone: " << m_zone-> name() << endl; -@@ -341,15 +342,16 @@ - } else if ( m_host ) { - if ( onOff ) { - m_protocolUsage = 0; -+ KMFProtocolUsage* pro; - -- if ( KMFProtocolUsage* pro = m_host->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) { -+ if ( pro = m_host->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) { - m_protocolUsage = pro; - } else { - KMFUndoEngine::instance()->startTransaction( - m_host, - i18n("Add protocol %1 to host %2.").tqarg( protUsage->protocol()->name() ).tqarg( m_host->guiName() ) - ); -- KMFProtocolUsage * pro = m_host->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol() ->getDOMTree() ); -+ pro = m_host->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol() ->getDOMTree() ); - - if ( pro ) { - kdDebug() << "Added Protocol to host: " << m_host-> name() << endl; diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-missing_ldflags.patch b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-missing_ldflags.patch deleted file mode 100644 index f2d236faa..000000000 --- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13-missing_ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kmyfirewall/kmyfirewall/core/Makefile.am.ROI 2012-08-05 17:28:28.006801940 +0200 -+++ kmyfirewall/kmyfirewall/core/Makefile.am 2012-08-05 17:28:40.878545270 +0200 -@@ -53,7 +53,7 @@ - - libkmfcoreincludedir = $(includedir)/kmyfirewall/core/ - --libkmfcore_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO) -+libkmfcore_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) - - libkmfcoreinclude_HEADERS = ipaddress.h \ - iptable.h \ diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.1.spec b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.1.spec deleted file mode 100644 index 22037de91..000000000 --- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.1.spec +++ /dev/null @@ -1,208 +0,0 @@ -# Default version for this component -%define kdecomp kmyfirewall - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: iptables based firewall configuration tool for KDE [Trinity] -Version: 1.1.1 -Release: 3%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdebase-devel >= 3.5.13.1 -BuildRequires: desktop-file-utils - - -%description -KMyFirewall attempts to make it easier to setup iptables based firewalls on -Linux systems. It will be the right tool if you like to have a so called -"Personal Firewall" running on your Linux box, but don't have the time and/or -the interest to spend hours in front of the iptables manual just to setup a -Firewall that keeps the "bad" people out. - -There is also the possibility to save entire rule sets, so you only have to -configure your rule set one time and then you can use it on several computers -giving each of them a similar configuration (p.e. school networks, office, -university etc.) - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description devel -%{summary} - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure - -%__make %{?_smp_mflags} - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -for f in hicolor Locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -for f in hicolor Locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO -%{tde_bindir}/kmyfirewall -%{tde_libdir}/libkmfcore.so.* -%{tde_libdir}/libkmfwidgets.so.* -%{tde_tdelibdir}/libkmfcompiler_ipt.la -%{tde_tdelibdir}/libkmfcompiler_ipt.so -%{tde_tdelibdir}/libkmfgenericinterfacepart.la -%{tde_tdelibdir}/libkmfgenericinterfacepart.so -%{tde_tdelibdir}/libkmfinstaller_linux.la -%{tde_tdelibdir}/libkmfinstaller_linux.so -%{tde_tdelibdir}/libkmfinstallerplugin.la -%{tde_tdelibdir}/libkmfinstallerplugin.so -%{tde_tdelibdir}/libkmfipteditorpart.la -%{tde_tdelibdir}/libkmfipteditorpart.so -%{tde_tdelibdir}/libkmfruleoptionedit_custom.la -%{tde_tdelibdir}/libkmfruleoptionedit_custom.so -%{tde_tdelibdir}/libkmfruleoptionedit_interface.la -%{tde_tdelibdir}/libkmfruleoptionedit_interface.so -%{tde_tdelibdir}/libkmfruleoptionedit_ip.la -%{tde_tdelibdir}/libkmfruleoptionedit_ip.so -%{tde_tdelibdir}/libkmfruleoptionedit_limit.la -%{tde_tdelibdir}/libkmfruleoptionedit_limit.so -%{tde_tdelibdir}/libkmfruleoptionedit_mac.la -%{tde_tdelibdir}/libkmfruleoptionedit_mac.so -%{tde_tdelibdir}/libkmfruleoptionedit_protocol.la -%{tde_tdelibdir}/libkmfruleoptionedit_protocol.so -%{tde_tdelibdir}/libkmfruleoptionedit_state.la -%{tde_tdelibdir}/libkmfruleoptionedit_state.so -%{tde_tdelibdir}/libkmfruleoptionedit_tos.la -%{tde_tdelibdir}/libkmfruleoptionedit_tos.so -%{tde_tdelibdir}/libkmfruletargetoptionedit_log.la -%{tde_tdelibdir}/libkmfruletargetoptionedit_log.so -%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.la -%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.so -%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.la -%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.so -%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.la -%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.so -%{tde_tdeappdir}/kmyfirewall.desktop -%{tde_datadir}/apps/kmfgenericinterfacepart/kmfgenericinterfacepartui.rc -%{tde_datadir}/apps/kmfipteditorpart/kmfipteditorpartui.rc -%{tde_datadir}/apps/kmfsystray -%{tde_datadir}/apps/kmyfirewall -%{tde_datadir}/config.kcfg/kmfconfig.kcfg -%{tde_datadir}/config/kmyfirewallrc -%{tde_tdedocdir}/HTML/en/kmyfirewall/ -%{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png -%{tde_datadir}/icons/Locolor/*/apps/kmyfirewall.png -%{tde_datadir}/mimelnk/application/kmfgrs.desktop -%{tde_datadir}/mimelnk/application/kmfnet.desktop -%{tde_datadir}/mimelnk/application/kmfpkg.desktop -%{tde_datadir}/mimelnk/application/kmfrs.desktop -%{tde_datadir}/services/kmf*.desktop -%{tde_datadir}/servicetypes/kmf*.desktop - -%files devel -%{tde_tdeincludedir}/kmyfirewall -%{tde_libdir}/libkmfcore.la -%{tde_libdir}/libkmfcore.so -%{tde_libdir}/libkmfwidgets.la -%{tde_libdir}/libkmfwidgets.so - -%changelog -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-3 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-2 -- GCC 4.7 fixes. [Commit #88d2d2a7] - -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.1.1-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.spec b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.spec deleted file mode 100644 index 0414eddca..000000000 --- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.spec +++ /dev/null @@ -1,207 +0,0 @@ -# Default version for this component -%define kdecomp kmyfirewall - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: iptables based firewall configuration tool for KDE [Trinity] -Version: 1.1.1 -Release: 2%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz - -# [kmyfirewall] GCC 4.7 fixes. [Commit #88d2d2a7] -Patch1: kmyfirewall-3.5.13-fix_gcc47_compilation.patch -# [kmyfirefall] Missing LDFLAGS cause FTBFS -Patch2: kmyfirewall-3.5.13-missing_ldflags.patch - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils - - -%description -KMyFirewall attempts to make it easier to setup iptables based firewalls on -Linux systems. It will be the right tool if you like to have a so called -"Personal Firewall" running on your Linux box, but don't have the time and/or -the interest to spend hours in front of the iptables manual just to setup a -Firewall that keeps the "bad" people out. - -There is also the possibility to save entire rule sets, so you only have to -configure your rule set one time and then you can use it on several computers -giving each of them a similar configuration (p.e. school networks, office, -university etc.) - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description devel -%{summary} - - -%prep -%setup -q -n applications/%{kdecomp} -%patch1 -p1 -%patch2 -p1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure - -%__make %{?_smp_mflags} - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -for f in hicolor Locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -for f in hicolor Locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO -%{tde_bindir}/kmyfirewall -%{tde_libdir}/libkmfcore.so.* -%{tde_libdir}/libkmfwidgets.so.* -%{tde_tdelibdir}/libkmfcompiler_ipt.la -%{tde_tdelibdir}/libkmfcompiler_ipt.so -%{tde_tdelibdir}/libkmfgenericinterfacepart.la -%{tde_tdelibdir}/libkmfgenericinterfacepart.so -%{tde_tdelibdir}/libkmfinstaller_linux.la -%{tde_tdelibdir}/libkmfinstaller_linux.so -%{tde_tdelibdir}/libkmfinstallerplugin.la -%{tde_tdelibdir}/libkmfinstallerplugin.so -%{tde_tdelibdir}/libkmfipteditorpart.la -%{tde_tdelibdir}/libkmfipteditorpart.so -%{tde_tdelibdir}/libkmfruleoptionedit_custom.la -%{tde_tdelibdir}/libkmfruleoptionedit_custom.so -%{tde_tdelibdir}/libkmfruleoptionedit_interface.la -%{tde_tdelibdir}/libkmfruleoptionedit_interface.so -%{tde_tdelibdir}/libkmfruleoptionedit_ip.la -%{tde_tdelibdir}/libkmfruleoptionedit_ip.so -%{tde_tdelibdir}/libkmfruleoptionedit_limit.la -%{tde_tdelibdir}/libkmfruleoptionedit_limit.so -%{tde_tdelibdir}/libkmfruleoptionedit_mac.la -%{tde_tdelibdir}/libkmfruleoptionedit_mac.so -%{tde_tdelibdir}/libkmfruleoptionedit_protocol.la -%{tde_tdelibdir}/libkmfruleoptionedit_protocol.so -%{tde_tdelibdir}/libkmfruleoptionedit_state.la -%{tde_tdelibdir}/libkmfruleoptionedit_state.so -%{tde_tdelibdir}/libkmfruleoptionedit_tos.la -%{tde_tdelibdir}/libkmfruleoptionedit_tos.so -%{tde_tdelibdir}/libkmfruletargetoptionedit_log.la -%{tde_tdelibdir}/libkmfruletargetoptionedit_log.so -%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.la -%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.so -%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.la -%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.so -%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.la -%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.so -%{tde_tdeappdir}/kmyfirewall.desktop -%{tde_datadir}/apps/kmfgenericinterfacepart/kmfgenericinterfacepartui.rc -%{tde_datadir}/apps/kmfipteditorpart/kmfipteditorpartui.rc -%{tde_datadir}/apps/kmfsystray -%{tde_datadir}/apps/kmyfirewall -%{tde_datadir}/config.kcfg/kmfconfig.kcfg -%{tde_datadir}/config/kmyfirewallrc -%{tde_tdedocdir}/HTML/en/kmyfirewall/ -%{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png -%{tde_datadir}/icons/Locolor/*/apps/kmyfirewall.png -%{tde_datadir}/mimelnk/application/kmfgrs.desktop -%{tde_datadir}/mimelnk/application/kmfnet.desktop -%{tde_datadir}/mimelnk/application/kmfpkg.desktop -%{tde_datadir}/mimelnk/application/kmfrs.desktop -%{tde_datadir}/services/kmf*.desktop -%{tde_datadir}/servicetypes/kmf*.desktop - -%files devel -%{tde_tdeincludedir}/kmyfirewall -%{tde_libdir}/libkmfcore.la -%{tde_libdir}/libkmfcore.so -%{tde_libdir}/libkmfwidgets.la -%{tde_libdir}/libkmfwidgets.so - -%Changelog -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-2 -- GCC 4.7 fixes. [Commit #88d2d2a7] - -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.1.1-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/kmymoney/23011-qt-sqlite3-0.2.tar.gz b/redhat/applications/kmymoney/23011-qt-sqlite3-0.2.tar.gz Binary files differdeleted file mode 100644 index 2d81662a6..000000000 --- a/redhat/applications/kmymoney/23011-qt-sqlite3-0.2.tar.gz +++ /dev/null diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney-14.0.0.spec index 0a169c4c1..b529c8547 100644 --- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec +++ b/redhat/applications/kmymoney/kmymoney-14.0.0.spec @@ -1,57 +1,79 @@ -# Default version for this component -%define tde_pkg kmymoney +# +# spec file for package kmymoney (version R14.0.0) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 %define tde_version 14.0.0 - -# Required for Mageia 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE specific building variables +%define tde_pkg kmymoney +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: personal finance manager for TDE +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.0.5 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Summary: Personal finance manager for TDE +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -Version: 1.0.5 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source1: kmymoneytitlelabel.png -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + BuildRequires: recode BuildRequires: libofx-devel @@ -80,12 +102,42 @@ Requires: libtqt3-mt-sqlite3 Requires: %{name}-common == %{version}-%{release} + %description KMyMoney is the Personal Finance Manager for TDE. It operates similar to MS-Money and Quicken, supports different account types, categorisation of expenses, QIF import/export, multiple currencies and initial online banking support. +%post +update-desktop-database %{tde_tdeappdir} > /dev/null +/sbin/ldconfig +for f in hicolor locolor Tango oxygen; do + touch --no-create %{tde_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : +done + +%postun +update-desktop-database %{tde_tdeappdir} > /dev/null +/sbin/ldconfig +for f in hicolor locolor Tango oxygen; do + touch --no-create %{tde_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : +done + +%files +%defattr(-,root,root,-) +%{tde_bindir}/kmymoney +%{tde_bindir}/kmymoney2 +%{tde_tdeappdir}/kmymoney2.desktop +%{tde_datadir}/mimelnk/application/x-kmymoney2.desktop +%{tde_datadir}/servicetypes/kmymoneyimporterplugin.desktop +%{tde_datadir}/servicetypes/kmymoneyplugin.desktop +%{tde_libdir}/*.so.* +%{tde_tdelibdir}/kmm_ofximport.la +%{tde_tdelibdir}/kmm_ofximport.so + +########## %package common Summary: KMyMoney architecture independent files @@ -97,6 +149,28 @@ This package contains architecture independent files needed for KMyMoney to run properly. It also provides KMyMoney documentation. Therefore, unless you have '%{name}' package installed, you will hardly find this package useful. +%files common -f kmymoney2.lang +%defattr(-,root,root,-) +%{tde_datadir}/apps/kmymoney2/ +%{tde_datadir}/config.kcfg/kmymoney2.kcfg +%{tde_datadir}/icons/hicolor/*/*/*.png +%dir %{tde_datadir}/icons/Tango/ +%dir %{tde_datadir}/icons/Tango/*/ +%dir %{tde_datadir}/icons/Tango/*/*/ +%{tde_datadir}/icons/Tango/*/*/*.png +%{tde_datadir}/icons/Tango/scalable/*.svgz +%{tde_datadir}/icons/locolor/*/*/*.png +%dir %{tde_datadir}/icons/oxygen/ +%dir %{tde_datadir}/icons/oxygen/*/ +%dir %{tde_datadir}/icons/oxygen/*/*/ +%{tde_datadir}/icons/oxygen/*/*/*.png +%{tde_datadir}/icons/oxygen/scalable/*.svgz +%{tde_tdedocdir}/HTML/en/kmymoney2/ +%{tde_mandir}/man1/kmymoney2.* +%{tde_datadir}/apps/kmm_ofximport/ +%{tde_datadir}/services/kmm_ofximport.desktop + +########## %package devel Summary: KMyMoney development files @@ -106,11 +180,23 @@ Requires: %{name} == %{version}-%{release} %description devel This package contains development files needed for KMyMoney plugins. +%files devel +%defattr(-,root,root,-) +%{tde_tdeincludedir}/kmymoney/ +%{tde_libdir}/libkmm_kdchart.la +%{tde_libdir}/libkmm_mymoney.la +%{tde_libdir}/libkmm_plugin.la +%{tde_libdir}/*.so +%{_libdir}/tqt3/plugins/designer/libkmymoney.so -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -173,66 +259,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%post -update-desktop-database %{tde_appdir} > /dev/null -/sbin/ldconfig -for f in hicolor locolor Tango oxygen; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -update-desktop-database %{tde_appdir} > /dev/null -/sbin/ldconfig -for f in hicolor locolor Tango oxygen; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/kmymoney -%{tde_bindir}/kmymoney2 -%{tde_tdeappdir}/kmymoney2.desktop -%{tde_datadir}/mimelnk/application/x-kmymoney2.desktop -%{tde_datadir}/servicetypes/kmymoneyimporterplugin.desktop -%{tde_datadir}/servicetypes/kmymoneyplugin.desktop -%{tde_libdir}/*.so.* -%{tde_tdelibdir}/kmm_ofximport.la -%{tde_tdelibdir}/kmm_ofximport.so - -%files common -f kmymoney2.lang -%defattr(-,root,root,-) -%{tde_datadir}/apps/kmymoney2/html/ -%{tde_datadir}/apps/kmymoney2/icons/*/*/*/*.png -%{tde_datadir}/apps/kmymoney2/kmymoney2ui.rc -%{tde_datadir}/apps/kmymoney2/misc/financequote.pl -%{tde_datadir}/apps/kmymoney2/pics/*.png -%{tde_datadir}/apps/kmymoney2/templates/*/*.kmt -%{tde_datadir}/apps/kmymoney2/tips -%{tde_datadir}/config.kcfg/kmymoney2.kcfg -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/icons/Tango/*/*/*.png -%{tde_datadir}/icons/Tango/scalable/*.svgz -%{tde_datadir}/icons/locolor/*/*/*.png -%{tde_datadir}/icons/oxygen/*/*/*.png -%{tde_datadir}/icons/oxygen/scalable/*.svgz -%{tde_tdedocdir}/HTML/en/kmymoney2/ -%{tde_mandir}/man1/kmymoney2.* -%{tde_datadir}/apps/kmm_ofximport/kmm_ofximport.rc -%{tde_datadir}/services/kmm_ofximport.desktop - -%files devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/kmymoney/*.h -%{tde_libdir}/libkmm_kdchart.la -%{tde_libdir}/libkmm_mymoney.la -%{tde_libdir}/libkmm_plugin.la -%{tde_libdir}/*.so -%{_libdir}/tqt3/plugins/designer/libkmymoney.so - - %changelog -* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-7 +* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.0.5-1 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-fix_gcc47_compilation.patch deleted file mode 100644 index f9c6cb62e..000000000 --- a/redhat/applications/kmymoney/kmymoney-3.5.13-fix_gcc47_compilation.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kmymoney/kmymoney2/plugins/ofximport/ofxpartner.cpp.ORI 2012-05-02 05:22:43.788349181 -0400 -+++ kmymoney/kmymoney2/plugins/ofximport/ofxpartner.cpp 2012-05-02 05:23:01.910909490 -0400 -@@ -20,6 +20,8 @@ - #include <config.h> - #endif - -+#include <unistd.h> -+ - // ---------------------------------------------------------------------------- - // QT Includes - diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-lots_of_crash.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-lots_of_crash.patch deleted file mode 100644 index 83bfec920..000000000 --- a/redhat/applications/kmymoney/kmymoney-3.5.13-lots_of_crash.patch +++ /dev/null @@ -1,238 +0,0 @@ -commit 2a54aa58cfe166f48d6f1395cbc6c9bfd5e31bfc -Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Date: 1326525051 -0600 - - Fix a number of crashes - -diff --git a/kmymoney2/converter/mymoneyqifprofile.cpp b/kmymoney2/converter/mymoneyqifprofile.cpp -index 52ef770..880b1c2 100644 ---- a/kmymoney2/converter/mymoneyqifprofile.cpp -+++ b/kmymoney2/converter/mymoneyqifprofile.cpp -@@ -769,7 +769,7 @@ TQString MyMoneyQifProfile::inputDateFormat(void) const - possibleDateFormats(list); - if(list.count() == 1) - return list.first(); -- return TQString(); -+ return TQString::null; - } - - void MyMoneyQifProfile::possibleDateFormats(TQStringList& list) const -diff --git a/kmymoney2/converter/mymoneyqifreader.cpp b/kmymoney2/converter/mymoneyqifreader.cpp -index 9390429..a974e8f 100644 ---- a/kmymoney2/converter/mymoneyqifreader.cpp -+++ b/kmymoney2/converter/mymoneyqifreader.cpp -@@ -714,7 +714,7 @@ const TQString MyMoneyQifReader::extractLine(const TQChar id, int cnt) - } - } - m_extractedLine = -1; -- return TQString(); -+ return TQString::null; - } - - void MyMoneyQifReader::extractSplits(TQValueList<qSplit>& listqSplits) const -diff --git a/kmymoney2/dialogs/kcategoryreassigndlg.cpp b/kmymoney2/dialogs/kcategoryreassigndlg.cpp -index 4de99f6..beb8e98 100644 ---- a/kmymoney2/dialogs/kcategoryreassigndlg.cpp -+++ b/kmymoney2/dialogs/kcategoryreassigndlg.cpp -@@ -53,7 +53,7 @@ KCategoryReassignDlg::~KCategoryReassignDlg() - TQString KCategoryReassignDlg::show(const MyMoneyAccount& category) - { - if (category.id().isEmpty()) -- return TQString(); // no payee available? nothing can be selected... -+ return TQString::null; // no payee available? nothing can be selected... - - AccountSet set; - set.addAccountGroup(MyMoneyAccount::Income); -@@ -79,12 +79,12 @@ TQString KCategoryReassignDlg::show(const MyMoneyAccount& category) - // if there is no category for reassignment left, we bail out - if(list.isEmpty()) { - KMessageBox::sorry(this, TQString("<qt>")+i18n("At least one transaction/schedule still references the category <b>%1</b>. However, at least one category with the same currency must exist so that the transactions/schedules can be reassigned.").tqarg(category.name())+TQString("</qt>")); -- return TQString(); -+ return TQString::null; - } - - // execute dialog and if aborted, return empty string - if (this->exec() == TQDialog::Rejected) -- return TQString(); -+ return TQString::null; - - // otherwise return index of selected payee - return m_category->selectedItem(); -diff --git a/kmymoney2/dialogs/knewloanwizard.cpp b/kmymoney2/dialogs/knewloanwizard.cpp -index 884807f..87baaf9 100644 ---- a/kmymoney2/dialogs/knewloanwizard.cpp -+++ b/kmymoney2/dialogs/knewloanwizard.cpp -@@ -1072,7 +1072,7 @@ int KNewLoanWizard::term(void) const - TQString KNewLoanWizard::initialPaymentAccount(void) const - { - if(m_dontCreatePayoutCheckBox->isChecked()) { -- return TQString(); -+ return TQString::null; - } - return m_assetAccountEdit->selectedItems().first(); - } -diff --git a/kmymoney2/dialogs/kpayeereassigndlg.cpp b/kmymoney2/dialogs/kpayeereassigndlg.cpp -index 0c3c0cf..1db13f1 100644 ---- a/kmymoney2/dialogs/kpayeereassigndlg.cpp -+++ b/kmymoney2/dialogs/kpayeereassigndlg.cpp -@@ -53,13 +53,13 @@ KPayeeReassignDlg::~KPayeeReassignDlg() - TQString KPayeeReassignDlg::show(const TQValueList<MyMoneyPayee>& payeeslist) - { - if (payeeslist.isEmpty()) -- return TQString(); // no payee available? nothing can be selected... -+ return TQString::null; // no payee available? nothing can be selected... - - payeeCombo->loadPayees(payeeslist); - - // execute dialog and if aborted, return empty string - if (this->exec() == TQDialog::Rejected) -- return TQString(); -+ return TQString::null; - - // otherwise return index of selected payee - return payeeCombo->selectedItem(); -diff --git a/kmymoney2/mymoney/mymoneyaccount.cpp b/kmymoney2/mymoney/mymoneyaccount.cpp -index 6ef1f9c..c83e834 100644 ---- a/kmymoney2/mymoney/mymoneyaccount.cpp -+++ b/kmymoney2/mymoney/mymoneyaccount.cpp -@@ -450,7 +450,7 @@ void MyMoneyAccountLoan::setPayee(const TQString& payee) - - const TQString MyMoneyAccountLoan::interestAccountId(void) const - { -- return TQString(); -+ return TQString::null; - } - - void MyMoneyAccountLoan::setInterestAccountId(const TQString& /* id */) -diff --git a/kmymoney2/mymoney/mymoneyfile.cpp b/kmymoney2/mymoney/mymoneyfile.cpp -index 4809b28..c59d577 100644 ---- a/kmymoney2/mymoney/mymoneyfile.cpp -+++ b/kmymoney2/mymoney/mymoneyfile.cpp -@@ -1230,7 +1230,7 @@ TQString MyMoneyFile::locateSubAccount(const MyMoneyAccount& base, const TQStrin - return locateSubAccount(nextBase, remainder); - } - } -- return TQString(); -+ return TQString::null; - } - - TQString MyMoneyFile::value(const TQString& key) const -diff --git a/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp b/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp -index 22fa1ac..cabf772 100644 ---- a/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp -+++ b/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp -@@ -55,7 +55,7 @@ const TQString& MyMoneyKeyValueContainer::value(const TQString& key) const - it = m_kvp.find(key); - if(it != m_kvp.end()) - return (*it); -- return TQString(); -+ return TQString::null; - } - - void MyMoneyKeyValueContainer::setValue(const TQString& key, const TQString& value) -diff --git a/kmymoney2/mymoney/mymoneyutils.cpp b/kmymoney2/mymoney/mymoneyutils.cpp -index 08ffff4..8012200 100644 ---- a/kmymoney2/mymoney/mymoneyutils.cpp -+++ b/kmymoney2/mymoney/mymoneyutils.cpp -@@ -305,7 +305,7 @@ TQString dateToString(const TQDate& date) - if(!date.isNull() && date.isValid()) - return date.toString(Qt::ISODate); - -- return TQString(); -+ return TQString::null; - } - - TQDate stringToDate(const TQString& str) -@@ -323,7 +323,7 @@ TQString TQStringEmpty(const TQString& val) - if(!val.isEmpty()) - return TQString(val); - -- return TQString(); -+ return TQString::null; - } - - unsigned long extractId(const TQString& txt) -diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp -index 084d73c..ec2d4a0 100644 ---- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp -+++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp -@@ -98,14 +98,14 @@ const TQString& KOnlineBankingtqStatus::appId(void) const - { - if(m_appId) - return m_appId->appId(); -- return TQString(); -+ return TQString::null; - } - - TQString KOnlineBankingtqStatus::headerVersion(void) const - { - if(m_headerVersion) - return m_headerVersion->headerVersion(); -- return TQString(); -+ return TQString::null; - } - - #include "konlinebankingstatus.moc" -diff --git a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp -index 36a05b5..7408a38 100644 ---- a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp -+++ b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp -@@ -125,7 +125,7 @@ const TQString& OfxAppVersion::appId(void) const - TQString app = m_combo->currentText(); - if(m_appMap[app] != defaultAppId) - return m_appMap[app]; -- return TQString(); -+ return TQString::null; - } - - MyMoneyOfxConnector::MyMoneyOfxConnector(const MyMoneyAccount& _account): -diff --git a/kmymoney2/widgets/kmymoneycombo.cpp b/kmymoney2/widgets/kmymoneycombo.cpp -index f8b6489..761b537 100644 ---- a/kmymoney2/widgets/kmymoneycombo.cpp -+++ b/kmymoney2/widgets/kmymoneycombo.cpp -@@ -588,7 +588,7 @@ public: - return it.key(); - } - } -- return TQString(); -+ return TQString::null; - } - }; - -diff --git a/kmymoney2/widgets/kmymoneywizard.cpp b/kmymoney2/widgets/kmymoneywizard.cpp -index ff00c78..f446acf 100644 ---- a/kmymoney2/widgets/kmymoneywizard.cpp -+++ b/kmymoney2/widgets/kmymoneywizard.cpp -@@ -106,7 +106,7 @@ bool KMyMoneyWizardPage::isComplete(void) const - - const TQString& KMyMoneyWizardPage::helpContext(void) const - { -- return TQString(); -+ return TQString::null; - } - - KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, WFlags f) : -diff --git a/kmymoney2/widgets/registeritem.h b/kmymoney2/widgets/registeritem.h -index e9c21d3..83b9a04 100644 ---- a/kmymoney2/widgets/registeritem.h -+++ b/kmymoney2/widgets/registeritem.h -@@ -88,14 +88,14 @@ public: - virtual const TQDate& sortPostDate(void) const { return nullDate; } - virtual int sortSamePostDate(void) const = 0; - virtual const TQDate& sortEntryDate(void) const { return nullDate; } -- virtual const TQString& sortPayee(void) const { return TQString(); } -+ virtual const TQString& sortPayee(void) const { return TQString::null; } - virtual const MyMoneyMoney& sortValue(void) const { return nullValue; } -- virtual const TQString& sortNumber(void) const { return TQString(); } -- virtual const TQString& sortEntryOrder(void) const { return TQString(); } -+ virtual const TQString& sortNumber(void) const { return TQString::null; } -+ virtual const TQString& sortEntryOrder(void) const { return TQString::null; } - virtual CashFlowDirection sortType(void) const { return Deposit; } -- virtual const TQString& sortCategory(void) const { return TQString(); } -+ virtual const TQString& sortCategory(void) const { return TQString::null; } - virtual MyMoneySplit::reconcileFlagE sortReconcileState(void) const { return MyMoneySplit::MaxReconcileState; } -- virtual const TQString& sortSecurity(void) const { return TQString(); } -+ virtual const TQString& sortSecurity(void) const { return TQString::null; } - - /** - * This method sets the row offset of the item in the register diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-recode_ftbfs.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-recode_ftbfs.patch deleted file mode 100644 index 522329f19..000000000 --- a/redhat/applications/kmymoney/kmymoney-3.5.13-recode_ftbfs.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- kmymoney/doc/en/Makefile.am.ORI 2011-11-26 17:57:22.473298551 +0100 -+++ kmymoney/doc/en/Makefile.am 2011-11-26 17:58:18.611423284 +0100 -@@ -111,7 +111,7 @@ - kmymoney-user.pdf: $(DOCBOOK_FILES) $(SCREENSHOT_FILES) - $(MAKE) get-files - $(MEINPROC) --check --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-nochunk.xsl $(srcdir)/index.docbook -o index.html; -- recode utf8..latin1 index.html -+ recode utf8..latin1 index.html || : - html2ps -o kmymoney-user.ps -n index.html - ps2pdf kmymoney-user.ps kmymoney-user.pdf - rm index.html kmymoney-user.ps ---- kmymoney/developer-doc/phb/Makefile.am.ORI 2011-11-26 12:00:54.708855347 -0500 -+++ kmymoney/developer-doc/phb/Makefile.am 2011-11-26 12:01:01.683692300 -0500 -@@ -106,7 +106,7 @@ - kmymoney-phb.pdf: $(DOCBOOK_FILES) - $(MAKE) get-files - $(MEINPROC) --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-nochunk.xsl $(srcdir)/phb.docbook -o index.html -- recode utf8..latin1 index.html -+ recode utf8..latin1 index.html || : - html2ps -o kmymoney-phb.ps -n index.html - ps2pdf kmymoney-phb.ps kmymoney-phb.pdf - rm index.html kmymoney-phb.ps diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-update_to_1.0.5.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-update_to_1.0.5.patch deleted file mode 100644 index 7aefe2026..000000000 --- a/redhat/applications/kmymoney/kmymoney-3.5.13-update_to_1.0.5.patch +++ /dev/null @@ -1,264 +0,0 @@ -commit 8654cea10f6902719006d5975db7dc07b2fcc713 -Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Date: 1326571732 -0600 - - Update to upstream stable version 1.0.5 - -diff --git a/ChangeLog b/ChangeLog -index d250496..c996acb 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,7 +1,40 @@ - -+2010-05-15 Thomas Baumgart <ipwizard@users.sourceforge.net> -+ * Released 1.0.5 -+ -+2010-05-12 Thomas Baumgart <ipwizard@users.sourceforge.net> -+ * Fixed the way to calculate balance variation for the linear regression -+ forecast method (backported from KDE4) -+ -+2010-05-09 Alvaro Soliverez <asoliverez@gmail.com> -+ * Fixed a crash when a budget selected for a report is no longer present -+ -+2010-05-04 Thomas Baumgart <ipwizard@users.sourceforge.net> -+ * replace all new line characters because we only have one line -+ available for the displayed data (backported from KDE4) -+ * Don't allow import of investment transactions that don't have a share -+ amount. This used to end in a div by zero when calculating the price. -+ (Backported from KDE4) -+ -+2010-05-03 Alvaro Soliverez <asoliverez@gmail.com> -+ * Add all overdue schedules when calculating forecast -+ * Do not show accounts of institutions if it has been selected -+ in the general settings to Do not show closed accounts -+ * Do not show an institution if it has no visible accounts and -+ it has been selected to not show closed accounts -+ -+2010-04-20 Thomas Baumgart <ipwizard@users.sourceforge.net> -+ * Backported fix from Ian Neal to solve problems when opening the ledger -+ with specific scheduled transactions -+ -+2010-04-03 Alvaro Soliverez <asoliverez@gmail.com> -+ * Fixed loop in payments of the home page when a schedule is set to -+ end by date -+ - 2010-03-30 Thomas Baumgart <ipwizard@users.sourceforge.net> - * Backported encoding patch from KDE4 version - * Bumped version number -+ * Released 1.0.4 - - 2010-03-29 Thomas Baumgart <ipwizard@users.sourceforge.net> - * Updated Finnish translation by Mikael Kujanpaa -diff --git a/configure.in b/configure.in -index 8a6c1b8..1a8dd02 100644 ---- a/configure.in -+++ b/configure.in -@@ -40,7 +40,7 @@ dnl Perform program name transformation - AC_ARG_PROGRAM - - dnl Automake doc recommends to do this only here. (Janos) --AM_INIT_AUTOMAKE(kmymoney2, 1.0.4) dnl searches for some needed programs -+AM_INIT_AUTOMAKE(kmymoney2, 1.0.5) dnl searches for some needed programs - - KDE_SET_PREFIX - -diff --git a/configure.in.in b/configure.in.in -index 3f82103..a90f40f 100644 ---- a/configure.in.in -+++ b/configure.in.in -@@ -1,6 +1,6 @@ - #MIN_CONFIG(3.3.1) - --AM_INIT_AUTOMAKE(kmymoney2,1.0.4) -+AM_INIT_AUTOMAKE(kmymoney2,1.0.5) - - KDE_ENABLE_HIDDEN_VISIBILITY - -diff --git a/kmymoney2/converter/mymoneystatementreader.cpp b/kmymoney2/converter/mymoneystatementreader.cpp -index 6756767..c08dcff 100644 ---- a/kmymoney2/converter/mymoneystatementreader.cpp -+++ b/kmymoney2/converter/mymoneystatementreader.cpp -@@ -664,6 +664,10 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra - if(!t_in.m_price.isZero()) { - s1.setPrice(t_in.m_price); - } else { -+ if(t_in.m_shares.isZero()) { -+ KMessageBox::information(0, i18n("This imported statement contains investment transactions with no share amount. These transactions will be ignored."), i18n("No share amount provided"), TQString("BlankAmount")); -+ return; -+ } - s1.setPrice(((t_in.m_amount - t_in.m_fees) / t_in.m_shares).convert(MyMoneyMoney::precToDenom(KMyMoneyGlobalSettings::pricePrecision()))); - } - -diff --git a/kmymoney2/mymoney/mymoneyforecast.cpp b/kmymoney2/mymoney/mymoneyforecast.cpp -index bfecce0..c1c88c7 100644 ---- a/kmymoney2/mymoney/mymoneyforecast.cpp -+++ b/kmymoney2/mymoney/mymoneyforecast.cpp -@@ -651,7 +651,7 @@ void MyMoneyForecast::addScheduledTransactions (void) - TQValueList<MyMoneySchedule> schedule; - - schedule = file->scheduleList("", MyMoneySchedule::TYPE_ANY, MyMoneySchedule::OCCUR_ANY, MyMoneySchedule::STYPE_ANY, -- TQDate::tqcurrentDate(), forecastEndDate()); -+ TQDate(), forecastEndDate()); - if(schedule.count() > 0) { - TQValueList<MyMoneySchedule>::Iterator it; - do { -@@ -871,8 +871,21 @@ MyMoneyMoney MyMoneyForecast::accountCycleVariation(const MyMoneyAccount& acc) - MyMoneyMoney cycleVariation; - - if (forecastMethod() == eHistoric) { -- for(int t_day = 1; t_day <= accountsCycle() ; ++t_day) { -- cycleVariation += m_accountTrendList[acc.id()][t_day]; -+ switch(historyMethod()) { -+ case 0: -+ case 1: -+ { -+ for(int t_day = 1; t_day <= accountsCycle() ; ++t_day) { -+ cycleVariation += m_accountTrendList[acc.id()][t_day]; -+ } -+ } -+ break; -+ -+ case 2: -+ { -+ cycleVariation = m_accountList[acc.id()][TQDate::currentDate().addDays(accountsCycle())] - m_accountList[acc.id()][TQDate::currentDate()]; -+ } -+ break; - } - } - return cycleVariation; -diff --git a/kmymoney2/reports/pivottable.cpp b/kmymoney2/reports/pivottable.cpp -index db73062..b75ffb9 100644 ---- a/kmymoney2/reports/pivottable.cpp -+++ b/kmymoney2/reports/pivottable.cpp -@@ -825,9 +825,27 @@ void PivotTable::calculateBudgetMapping( void ) - // - // It will choose the first budget in the list for the start year of the report if no budget is select - MyMoneyBudget budget = MyMoneyBudget(); -+ -+ TQValueList<MyMoneyBudget> budgets = file->budgetList(); -+ bool validBudget = false; -+ -+ //check that the selected budget is valid -+ if (m_config_f.budget() != "Any") { -+ TQValueList<MyMoneyBudget>::const_iterator budgets_it = budgets.begin(); -+ while( budgets_it != budgets.end() ) { -+ //pick the budget by id -+ if ((*budgets_it).id() == m_config_f.budget()) { -+ budget = file->budget((*budgets_it).id()); -+ validBudget = true; -+ break; -+ } -+ ++budgets_it; -+ } -+ } -+ - //if no budget has been selected -- if (m_config_f.budget() == "Any" ) { -- TQValueList<MyMoneyBudget> budgets = file->budgetList(); -+ if (!validBudget ) { -+ - TQValueList<MyMoneyBudget>::const_iterator budgets_it = budgets.begin(); - while( budgets_it != budgets.end() ) { - //pick the first budget that matches the report start year -@@ -843,9 +861,6 @@ void PivotTable::calculateBudgetMapping( void ) - - //assign the budget to the report - m_config_f.setBudget(budget.id(), m_config_f.isIncludingBudgetActuals()); -- } else { -- //pick the budget selected by the user -- budget = file->budget( m_config_f.budget()); - } - - // Dump the budget -diff --git a/kmymoney2/views/kgloballedgerview.cpp b/kmymoney2/views/kgloballedgerview.cpp -index 8209d3f..e82459a 100644 ---- a/kmymoney2/views/kgloballedgerview.cpp -+++ b/kmymoney2/views/kgloballedgerview.cpp -@@ -485,7 +485,12 @@ void KGlobalLedgerView::loadView(void) - break; - - // for all others, we check if the next payment date is still 'in range' -- s.setNextDueDate(s.nextPayment(s.nextDueDate())); -+ TQDate nextDueDate = s.nextPayment(s.nextDueDate()); -+ if (nextDueDate.isValid()) { -+ s.setNextDueDate(nextDueDate); -+ } else { -+ break; -+ } - } - scheduleList.pop_front(); - } -diff --git a/kmymoney2/views/khomeview.cpp b/kmymoney2/views/khomeview.cpp -index 60bb173..8745d64 100644 ---- a/kmymoney2/views/khomeview.cpp -+++ b/kmymoney2/views/khomeview.cpp -@@ -595,6 +595,13 @@ void KHomeView::showPayments(void) - schedule.remove(it); - continue; - } -+ -+ //if nextPayment returns an invalid date, setNextDueDate will just skip it, resulting in a loop -+ //we check the resulting date and erase the schedule if invalid -+ if(!((*it).nextPayment((*it).nextDueDate())).isValid()) { -+ schedule.remove(it); -+ continue; -+ } - - (*it).setNextDueDate((*it).nextPayment((*it).nextDueDate())); - qBubbleSort(schedule); -diff --git a/kmymoney2/views/kinstitutionsview.cpp b/kmymoney2/views/kinstitutionsview.cpp -index 0b9258f..87c0fc1 100644 ---- a/kmymoney2/views/kinstitutionsview.cpp -+++ b/kmymoney2/views/kinstitutionsview.cpp -@@ -161,6 +161,9 @@ void KInstitutionsView::loadAccounts(void) - - // hide it, if unused - noInstitutionItem->setVisible(noInstitutionItem->childCount() != 0); -+ -+ bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked() -+ || !KMyMoneyGlobalSettings::hideClosedAccounts(); - - TQValueList<MyMoneyInstitution> list = file->institutionList(); - TQValueList<MyMoneyInstitution>::const_iterator it_i; -@@ -168,6 +171,8 @@ void KInstitutionsView::loadAccounts(void) - KMyMoneyAccountTreeItem* item = new KMyMoneyAccountTreeItem(m_accountTree, *it_i); - item->setPixmap(0, none.pixmap()); - loadSubAccounts(item, (*it_i).id()); -+ if(!showClosedAccounts) -+ item->setVisible(item->childCount() != 0); - } - - } catch(MyMoneyException *e) { -@@ -201,7 +206,8 @@ void KInstitutionsView::loadAccounts(void) - - void KInstitutionsView::loadSubAccounts(KMyMoneyAccountTreeItem* parent) - { -- bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked(); -+ bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked() -+ || !KMyMoneyGlobalSettings::hideClosedAccounts(); - const MyMoneyAccount& account = dynamic_cast<const MyMoneyAccount&>(parent->itemObject()); - TQValueList<TQString>::const_iterator it_a; - MyMoneyFile* file = MyMoneyFile::instance(); -@@ -230,7 +236,8 @@ void KInstitutionsView::loadSubAccounts(KMyMoneyAccountTreeItem* parent, const T - - TQMap<TQString, MyMoneyAccount>::const_iterator it_a; - MyMoneyMoney value; -- bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked(); -+ bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked() -+ || !KMyMoneyGlobalSettings::hideClosedAccounts(); - - for(it_a = m_accountMap.begin(); it_a != m_accountMap.end(); ++it_a) { - const MyMoneyAccount& acc = *it_a; -diff --git a/kmymoney2/widgets/stdtransactionmatched.cpp b/kmymoney2/widgets/stdtransactionmatched.cpp -index 833c88e..9900c3c 100644 ---- a/kmymoney2/widgets/stdtransactionmatched.cpp -+++ b/kmymoney2/widgets/stdtransactionmatched.cpp -@@ -179,6 +179,8 @@ - memo = memo.left(pos); - if(memo.endsWith("\n")) - memo = memo.left(pos-1); -+ // replace all new line characters because we only have one line available for the displayed data -+ memo.replace('\n', " "); - } - } - txt = TQString("%1 %2").tqarg(postDate.toString(Qt::ISODate)).tqarg(memo); diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.1.spec b/redhat/applications/kmymoney/kmymoney-3.5.13.1.spec deleted file mode 100644 index 9cc8c496b..000000000 --- a/redhat/applications/kmymoney/kmymoney-3.5.13.1.spec +++ /dev/null @@ -1,277 +0,0 @@ -# Default version for this component -%define kdecomp kmymoney - -# Required for Mageia 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - -%if 0%{?mgaversion} || 0%{?mdkversion} -%define qt3pluginsdir %{_libdir}/qt3/plugins -%endif -%if 0%{?rhel} || 0%{?fedora} -%define qt3pluginsdir %{_libdir}/qt-3.3/plugins -%endif -%if 0%{?suse_version} -%define qt3pluginsdir /usr/lib/qt3/plugins -%endif - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: personal finance manager for TDE - -Version: 1.0.5 -Release: 3%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz -Source1: kmymoneytitlelabel.png - -# [kmymoney] Missing LDFLAGS causing FTBFS -Patch4: kmymoney-3.5.13-missing_ldflags.patch - -# [kmymoney] Fix QT3 plugins directory location -Patch5: kmymoney-3.5.13-fix_qt3_plugins_location.patch - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-arts-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdebase-devel >= 3.5.13.1 -BuildRequires: desktop-file-utils - -BuildRequires: recode -BuildRequires: html2ps -BuildRequires: libofx-devel - -%if 0%{?mgaversion} || 0%{?pclinuxos} -BuildRequires: %{_lib}OpenSP5-devel -%else -BuildRequires: opensp-devel -%endif - -Requires: %{name}-common == %{version} - -%description -KMyMoney is the Personal Finance Manager for TDE. It operates similar to -MS-Money and Quicken, supports different account types, categorisation of -expenses, QIF import/export, multiple currencies and initial online banking -support. - - -%package common -Summary: KMyMoney architecture independent files -Group: Applications/Utilities -Requires: %{name} == %{version} - -%description common -This package contains architecture independent files needed for KMyMoney to -run properly. It also provides KMyMoney documentation. Therefore, unless you -have '%{name}' package installed, you will hardly find this package useful. - - -%package devel -Summary: KMyMoney development files -Group: Development/Libraries -Requires: %{name} == %{version} - -%description devel -This package contains development files needed for KMyMoney plugins. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 -%if 0%{?mgaversion} || 0%{?mdkversion} -%patch5 -p1 -b .qtpluginsdir -%endif - -%__install -m644 %{SOURCE1} kmymoney2/widgets/ - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -export KDEDIR=%{tde_prefix} - -# Required to find the QT3 plugins directory -%if 0%{?mgaversion} || 0%{?mdkversion} -export QTPLUGINS=%{_libdir}/qt3/plugins -%endif - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure \ - --enable-pdf-docs \ - --enable-ofxplugin \ - --enable-ofxbanking \ - --enable-qtdesigner \ - --enable-sqlite3 - -# Fix FTBFS inside sqlite3 archive -patch -p1 < %{PATCH4} - -%__make %{?_smp_mflags} - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} - -# Required to find the QT3 plugins directory -%if 0%{?mgaversion} || 0%{?mdkversion} -export QTPLUGINS=%{_libdir}/qt3/plugins -%endif - -%__make install DESTDIR=%{buildroot} - - - - -## File lists -# HTML (1.0) -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then - for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi - done -fi - -%find_lang kmymoney2 - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -/sbin/ldconfig -for f in hicolor locolor Tango oxygen; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -update-desktop-database %{tde_appdir} > /dev/null -/sbin/ldconfig -for f in hicolor locolor Tango oxygen; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%files -%defattr(-,root,root,-) -%{tde_bindir}/kmymoney -%{tde_bindir}/kmymoney2 -%{tde_tdeappdir}/kmymoney2.desktop -%{tde_datadir}/mimelnk/application/x-kmymoney2.desktop -%{tde_datadir}/servicetypes/kmymoneyimporterplugin.desktop -%{tde_datadir}/servicetypes/kmymoneyplugin.desktop -%{tde_libdir}/*.so.* -%{tde_tdelibdir}/kmm_ofximport.la -%{tde_tdelibdir}/kmm_ofximport.so - -%files common -f kmymoney2.lang -%defattr(-,root,root,-) -%{tde_datadir}/apps/kmymoney2/html/ -%{tde_datadir}/apps/kmymoney2/icons/*/*/*/*.png -%{tde_datadir}/apps/kmymoney2/kmymoney2ui.rc -%{tde_datadir}/apps/kmymoney2/misc/financequote.pl -%{tde_datadir}/apps/kmymoney2/pics/*.png -%{tde_datadir}/apps/kmymoney2/templates/*/*.kmt -%{tde_datadir}/apps/kmymoney2/tips -%{tde_datadir}/config.kcfg/kmymoney2.kcfg -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/icons/Tango/*/*/*.png -%{tde_datadir}/icons/Tango/scalable/*.svgz -%{tde_datadir}/icons/locolor/*/*/*.png -%{tde_datadir}/icons/oxygen/*/*/*.png -%{tde_datadir}/icons/oxygen/scalable/*.svgz -%{tde_tdedocdir}/HTML/en/kmymoney2/ -%{tde_mandir}/man1/kmymoney2.* -%{tde_datadir}/apps/kmm_ofximport/kmm_ofximport.rc -%{tde_datadir}/services/kmm_ofximport.desktop - - -%files devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/kmymoney/*.h -%{tde_libdir}/libkmm_kdchart.la -%{tde_libdir}/libkmm_mymoney.la -%{tde_libdir}/libkmm_plugin.la -%{tde_libdir}/*.so -%{qt3pluginsdir}/sqldrivers/libsqlite3*.so -%{qt3pluginsdir}/designer/libkmymoney.so - -%changelog -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-3 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2 -- Rebuild for Fedora 17 -- Fix compilation with GCC 4.7 [Bug #958] - -* Sun Jan 15 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1 -- Updates to upstream 1.0.5 - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.4-1 -- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.spec b/redhat/applications/kmymoney/kmymoney-3.5.13.spec deleted file mode 100644 index dfe995a5f..000000000 --- a/redhat/applications/kmymoney/kmymoney-3.5.13.spec +++ /dev/null @@ -1,278 +0,0 @@ -# Default version for this component -%define kdecomp kmymoney - -# Required for Mageia 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - -%if 0%{?mgaversion} || 0%{?mdkversion} -%define qt3pluginsdir %{_libdir}/qt3/plugins -%else -%define qt3pluginsdir %{_libdir}/qt-3.3/plugins -%endif - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: personal finance manager for TDE - -Version: 1.0.5 -Release: 2%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz -Source1: kmymoneytitlelabel.png -Patch0: kmymoney-3.5.13-recode_ftbfs.patch - -# TDE Commit: 2a54aa58cfe166f48d6f1395cbc6c9bfd5e31bfc -Patch1: kmymoney-3.5.13-lots_of_crash.patch - -# TDE Commit: 8654cea10f6902719006d5975db7dc07b2fcc713 -Patch2: kmymoney-3.5.13-update_to_1.0.5.patch - -# [kmymoney] Fix compilation with GCC 4.7 [Bug #958] -Patch3: kmymoney-3.5.13-fix_gcc47_compilation.patch - -# [kmymoney] Missing LDFLAGS causing FTBFS -Patch4: kmymoney-3.5.13-missing_ldflags.patch - -# [kmymoney] Fix QT3 plugins directory location -Patch5: kmymoney-3.5.13-fix_qt3_plugins_location.patch - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-arts-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils - -BuildRequires: recode -BuildRequires: html2ps -BuildRequires: libofx-devel - -%if 0%{?mgaversion} -BuildRequires: %{_lib}OpenSP5-devel -%else -BuildRequires: opensp-devel -%endif - -Requires: %{name}-common == %{version} - -%description -KMyMoney is the Personal Finance Manager for TDE. It operates similar to -MS-Money and Quicken, supports different account types, categorisation of -expenses, QIF import/export, multiple currencies and initial online banking -support. - - -%package common -Summary: KMyMoney architecture independent files -Group: Applications/Utilities -Requires: %{name} == %{version} - -%description common -This package contains architecture independent files needed for KMyMoney to -run properly. It also provides KMyMoney documentation. Therefore, unless you -have '%{name}' package installed, you will hardly find this package useful. - - -%package devel -Summary: KMyMoney development files -Group: Development/Libraries -Requires: %{name} == %{version} - -%description devel -This package contains development files needed for KMyMoney plugins. - - -%prep -%setup -q -n applications/%{kdecomp} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%if 0%{?mgaversion} || 0%{?mdkversion} -%patch5 -p1 -b .qtpluginsdir -%endif - -%__install -m644 %{SOURCE1} kmymoney2/widgets/ - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -# Required to find the QT3 plugins directory -%if 0%{?mgaversion} || 0%{?mdkversion} -export QTPLUGINS=%{_libdir}/qt3/plugins -%endif - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure \ - --enable-pdf-docs \ - --enable-ofxplugin \ - --enable-ofxbanking \ - --enable-qtdesigner \ - --enable-sqlite3 - -# Fix FTBFS inside sqlite3 archive -patch -p1 < %{PATCH4} - -%__make %{?_smp_mflags} - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} - -# Required to find the QT3 plugins directory -%if 0%{?mgaversion} || 0%{?mdkversion} -export QTPLUGINS=%{_libdir}/qt3/plugins -%endif - -%__make install DESTDIR=%{buildroot} - - - - -## File lists -# HTML (1.0) -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then - for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi - done -fi - -%find_lang kmymoney2 - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -/sbin/ldconfig -for f in hicolor locolor Tango oxygen; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -update-desktop-database %{tde_appdir} > /dev/null -/sbin/ldconfig -for f in hicolor locolor Tango oxygen; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%files -%defattr(-,root,root,-) -%{tde_bindir}/kmymoney -%{tde_bindir}/kmymoney2 -%{tde_tdeappdir}/kmymoney2.desktop -%{tde_datadir}/mimelnk/application/x-kmymoney2.desktop -%{tde_datadir}/servicetypes/kmymoneyimporterplugin.desktop -%{tde_datadir}/servicetypes/kmymoneyplugin.desktop -%{tde_libdir}/*.so.* -%{tde_tdelibdir}/kmm_ofximport.la -%{tde_tdelibdir}/kmm_ofximport.so - -%files common -f kmymoney2.lang -%defattr(-,root,root,-) -%{tde_datadir}/apps/kmymoney2/html/ -%{tde_datadir}/apps/kmymoney2/icons/*/*/*/*.png -%{tde_datadir}/apps/kmymoney2/kmymoney2ui.rc -%{tde_datadir}/apps/kmymoney2/misc/financequote.pl -%{tde_datadir}/apps/kmymoney2/pics/*.png -%{tde_datadir}/apps/kmymoney2/templates/*/*.kmt -%{tde_datadir}/apps/kmymoney2/tips -%{tde_datadir}/config.kcfg/kmymoney2.kcfg -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/icons/Tango/*/*/*.png -%{tde_datadir}/icons/Tango/scalable/*.svgz -%{tde_datadir}/icons/locolor/*/*/*.png -%{tde_datadir}/icons/oxygen/*/*/*.png -%{tde_datadir}/icons/oxygen/scalable/*.svgz -%{tde_tdedocdir}/HTML/en/kmymoney2/ -%{tde_mandir}/man1/kmymoney2.* -%{tde_datadir}/apps/kmm_ofximport/kmm_ofximport.rc -%{tde_datadir}/services/kmm_ofximport.desktop - - -%files devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/kmymoney/*.h -%{tde_libdir}/libkmm_kdchart.la -%{tde_libdir}/libkmm_mymoney.la -%{tde_libdir}/libkmm_plugin.la -%{tde_libdir}/*.so -%{qt3pluginsdir}/sqldrivers/libsqlite3*.so -%{qt3pluginsdir}/designer/libkmymoney.so - -%Changelog -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2 -- Rebuild for Fedora 17 -- Fix compilation with GCC 4.7 [Bug #958] - -* Sun Jan 15 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1 -- Updates to upstream 1.0.5 - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.4-1 -- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/kmymoney/admin-fix-parallel-test.diff b/redhat/applications/kmymoney/patches/3.5.13.2/admin-fix-parallel-test.diff index 9f6f46ba8..9f6f46ba8 100644 --- a/redhat/applications/kmymoney/admin-fix-parallel-test.diff +++ b/redhat/applications/kmymoney/patches/3.5.13.2/admin-fix-parallel-test.diff diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-fix_qt3_plugins_location.patch b/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13-fix_qt3_plugins_location.patch index 8a6754fb5..8a6754fb5 100644 --- a/redhat/applications/kmymoney/kmymoney-3.5.13-fix_qt3_plugins_location.patch +++ b/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13-fix_qt3_plugins_location.patch diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-missing_ldflags.patch b/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13-missing_ldflags.patch index c80007000..c80007000 100644 --- a/redhat/applications/kmymoney/kmymoney-3.5.13-missing_ldflags.patch +++ b/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13-missing_ldflags.patch diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.2-ftbfs.patch b/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13.2-ftbfs.patch index 87e022f0f..87e022f0f 100644 --- a/redhat/applications/kmymoney/kmymoney-3.5.13.2-ftbfs.patch +++ b/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13.2-ftbfs.patch diff --git a/redhat/applications/knemo/knemo-14.0.0.spec b/redhat/applications/knemo/knemo-14.0.0.spec index ad3228a19..d70925435 100644 --- a/redhat/applications/knemo/knemo-14.0.0.spec +++ b/redhat/applications/knemo/knemo-14.0.0.spec @@ -1,52 +1,79 @@ -# Default version for this component -%define tde_pkg knemo +# +# spec file for package knemo (version R14.0.0) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 %define tde_version 14.0.0 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE specific building variables +%define tde_pkg knemo +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%define _docdir %{tde_docdir} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.4.8 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Summary: Network interfaces monitor for the Trinity systray +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ +#URL: http://beta.smileaf.org/projects -Name: trinity-%{tde_pkg} -Summary: network interfaces monitor for the Trinity systray -Version: 0.4.8 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://beta.smileaf.org/projects +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif + BuildRequires: gettext %if 0%{?fedora} >= 18 @@ -65,12 +92,14 @@ ifconfig, route and iwconfig tools. Homepage: http://extragear.kde.org/apps/knemo/ +########## - -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -83,7 +112,6 @@ Homepage: http://extragear.kde.org/apps/knemo/ %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -115,12 +143,12 @@ export PATH="%{tde_bindir}:${PATH}" %post -update-desktop-database %{tde_appdir} > /dev/null +update-desktop-database %{tde_tdeappdir} > /dev/null touch --no-create %{tde_datadir}/icons/crystalsvg || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %postun -update-desktop-database %{tde_appdir} > /dev/null +update-desktop-database %{tde_tdeappdir} > /dev/null touch --no-create %{tde_datadir}/icons/crystalsvg || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : @@ -132,7 +160,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %{tde_tdelibdir}/kded_knemod.la %{tde_tdelibdir}/kded_knemod.so %{tde_tdeappdir}/kcm_knemo.desktop -%{tde_datadir}/apps/knemo/eventsrc +%{tde_datadir}/apps/knemo/ %{tde_datadir}/icons/crystalsvg/*/*/*.png %{tde_datadir}/locale/*/LC_MESSAGES/knemod.mo %{tde_datadir}/locale/*/LC_MESSAGES/kcm_knemo.mo @@ -141,5 +169,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.8-6 +* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.4.8-1 - Initial release for TDE 14.0.0 diff --git a/redhat/dependencies/qt3/0084-compositing-properties.patch b/redhat/dependencies/qt3/0084-compositing-properties.patch deleted file mode 100644 index 368b6c267..000000000 --- a/redhat/dependencies/qt3/0084-compositing-properties.patch +++ /dev/null @@ -1,80 +0,0 @@ -qt-bugs@ issue : none -bugs.kde.org number : none -applied: no -author: Lubos Lunak <l.lunak@kde.org> - -This patch makes override-redirect windows (popup menu, dropdown menu, -tooltip, combobox, etc.) also have more window properties like WM_CLASS, -so they can be used when compositing. - ---- src/kernel/qwidget_x11.cpp.sav 2007-06-25 10:36:42.000000000 +0200 -+++ src/kernel/qwidget_x11.cpp 2007-10-02 15:30:13.000000000 +0200 -@@ -557,7 +557,10 @@ void QWidget::create( WId window, bool i - wsa.save_under = True; - XChangeWindowAttributes( dpy, id, CWOverrideRedirect | CWSaveUnder, - &wsa ); -- x11SetWindowType(); -+ XClassHint class_hint; -+ class_hint.res_name = (char *) qAppName(); // application name -+ class_hint.res_class = (char *) qAppClass(); // application class -+ XSetClassHint( dpy, id, &class_hint ); - } else if ( topLevel && !desktop ) { // top-level widget - QWidget *p = parentWidget(); // real parent - if (p) -@@ -620,8 +623,6 @@ void QWidget::create( WId window, bool i - else - XDeleteProperty(dpy, id, qt_xa_motif_wm_hints); - -- x11SetWindowType(); -- - // set _NET_WM_WINDOW_STATE - if (curr_winstate > 0) - XChangeProperty(dpy, id, qt_net_wm_state, XA_ATOM, 32, PropModeReplace, -@@ -629,11 +630,6 @@ void QWidget::create( WId window, bool i - else - XDeleteProperty(dpy, id, qt_net_wm_state); - -- // set _NET_WM_PID -- long curr_pid = getpid(); -- XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace, -- (unsigned char *) &curr_pid, 1); -- - #ifndef QT_NO_XSYNC - // set _NET_WM_SYNC_COUNTER - createSyncCounter(); -@@ -645,19 +641,31 @@ void QWidget::create( WId window, bool i - // when we create a toplevel widget, the frame strut should be dirty - fstrut_dirty = 1; - -+ } else { -+ // non-toplevel widgets don't have a frame, so no need to -+ // update the strut -+ fstrut_dirty = 0; -+ } -+ -+ if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows -+ x11SetWindowType(); -+ -+ // set _NET_WM_PID -+ long curr_pid = getpid(); -+ XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace, -+ (unsigned char *) &curr_pid, 1); -+ - // declare the widget's object name as window role - XChangeProperty( dpy, id, - qt_window_role, XA_STRING, 8, PropModeReplace, - (unsigned char *)name(), qstrlen( name() ) ); - - // set client leader property -+ if ( !qt_x11_wm_client_leader ) -+ qt_x11_create_wm_client_leader(); - XChangeProperty( dpy, id, qt_wm_client_leader, - XA_WINDOW, 32, PropModeReplace, - (unsigned char *)&qt_x11_wm_client_leader, 1 ); -- } else { -- // non-toplevel widgets don't have a frame, so no need to -- // update the strut -- fstrut_dirty = 0; - } - - if ( initializeWindow ) { diff --git a/redhat/dependencies/qt3/qt-3.0.5-nodebug.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.0.5-nodebug.patch index 09d697fb4..09d697fb4 100644 --- a/redhat/dependencies/qt3/qt-3.0.5-nodebug.patch +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.0.5-nodebug.patch diff --git a/redhat/dependencies/qt3/qt-3.1.0-makefile.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.1.0-makefile.patch index 009ab81fb..009ab81fb 100644 --- a/redhat/dependencies/qt3/qt-3.1.0-makefile.patch +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.1.0-makefile.patch diff --git a/redhat/dependencies/qt3/qt-3.3.4-print-CJK.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.4-print-CJK.patch index 5bd5e9e0a..5bd5e9e0a 100644 --- a/redhat/dependencies/qt3/qt-3.3.4-print-CJK.patch +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.4-print-CJK.patch diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-214371.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-214371.patch index 9dca7998d..9dca7998d 100644 --- a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-214371.patch +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-214371.patch diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-gu-228452.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-gu-228452.patch index 84b885b8b..84b885b8b 100644 --- a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-gu-228452.patch +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-gu-228452.patch diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-209097.patch index 01f3824c1..01f3824c1 100644 --- a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-209097.patch diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-209974.patch index 8dbb2ae98..8dbb2ae98 100644 --- a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-209974.patch diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-217657.patch index eb880b1cc..eb880b1cc 100644 --- a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-217657.patch diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-te_IN-211259.patch index eb3868c96..eb3868c96 100644 --- a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-te_IN-211259.patch diff --git a/redhat/dependencies/qt3/qt-3.3.8-fontrendering-214570.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.8-fontrendering-214570.patch index 41a74fba7..41a74fba7 100644 --- a/redhat/dependencies/qt3/qt-3.3.8-fontrendering-214570.patch +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.8-fontrendering-214570.patch diff --git a/redhat/dependencies/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.8-fontrendering-as_IN-209972.patch index 7583239cc..7583239cc 100644 --- a/redhat/dependencies/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.8-fontrendering-as_IN-209972.patch diff --git a/redhat/dependencies/qt3/qt-uic-nostdlib.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-uic-nostdlib.patch index 02a40b225..02a40b225 100644 --- a/redhat/dependencies/qt3/qt-uic-nostdlib.patch +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-uic-nostdlib.patch diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.2-quiet.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.2-quiet.patch index 6dce7aa80..6dce7aa80 100644 --- a/redhat/dependencies/qt3/qt-x11-free-3.3.2-quiet.patch +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.2-quiet.patch diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.4-fullscreen.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.4-fullscreen.patch index 0d03f0809..0d03f0809 100644 --- a/redhat/dependencies/qt3/qt-x11-free-3.3.4-fullscreen.patch +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.4-fullscreen.patch diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-qfontdatabase_x11.patch index a9cfaf4c3..a9cfaf4c3 100644 --- a/redhat/dependencies/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-qfontdatabase_x11.patch diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch index ee960442e..ee960442e 100644 --- a/redhat/dependencies/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.6-strip.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-strip.patch index efc24c8a1..efc24c8a1 100644 --- a/redhat/dependencies/qt3/qt-x11-free-3.3.6-strip.patch +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-strip.patch diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.7-umask.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.7-umask.patch index f2351909f..f2351909f 100644 --- a/redhat/dependencies/qt3/qt-x11-free-3.3.7-umask.patch +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.7-umask.patch diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.8b-typo.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.8b-typo.patch index c1ff66c2c..c1ff66c2c 100644 --- a/redhat/dependencies/qt3/qt-x11-free-3.3.8b-typo.patch +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.8b-typo.patch diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.8b-uic-multilib.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.8b-uic-multilib.patch index 341cab7e1..341cab7e1 100644 --- a/redhat/dependencies/qt3/qt-x11-free-3.3.8b-uic-multilib.patch +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.8b-uic-multilib.patch diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch b/redhat/dependencies/qt3/patches/obsolete/qt-x11-free-3.3.7-arm.patch index 0c93c416a..0c93c416a 100644 --- a/redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch +++ b/redhat/dependencies/qt3/patches/obsolete/qt-x11-free-3.3.7-arm.patch diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.8-odbc.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.8-odbc.patch deleted file mode 100644 index 6f21e3cf1..000000000 --- a/redhat/dependencies/qt3/qt-x11-free-3.3.8-odbc.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp ---- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig 2009-02-24 11:32:27.000000000 +0100 -+++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp 2009-02-24 11:33:43.000000000 +0100 -@@ -57,13 +57,13 @@ - #endif - - // newer platform SDKs use SQLLEN instead of SQLINTEGER --#ifdef SQLLEN -+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) - # define QSQLLEN SQLLEN - #else - # define QSQLLEN SQLINTEGER - #endif - --#ifdef SQLULEN -+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) - # define QSQLULEN SQLULEN - #else - # define QSQLULEN SQLUINTEGER diff --git a/redhat/dependencies/qt3/qt3-3.3.8.d-fix_png15_support.patch b/redhat/dependencies/qt3/qt3-3.3.8.d-fix_png15_support.patch deleted file mode 100644 index c8987d66b..000000000 --- a/redhat/dependencies/qt3/qt3-3.3.8.d-fix_png15_support.patch +++ /dev/null @@ -1,276 +0,0 @@ -commit e278b858739babff5cc19ca81a661e1256d162e7 -Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Date: 1326063972 -0600 - - Fix Qt3 builds with libpng15 - This partially closes Bug 683 - -diff --git a/src/kernel/qpngio.cpp b/src/kernel/qpngio.cpp -index 25ce927..58e6e7e 100644 ---- a/src/kernel/qpngio.cpp -+++ b/src/kernel/qpngio.cpp -@@ -46,6 +46,9 @@ - #include "qiodevice.h" - - #include <png.h> -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) -+#include <zlib.h> -+#endif /* LIBPNG 1.5 */ - - - #ifdef Q_OS_TEMP -@@ -126,9 +129,29 @@ void setup_qt( QImage& image, png_structp png_ptr, png_infop info_ptr, float scr - png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, - 0, 0, 0); - -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) -+ png_colorp info_ptr_palette = NULL; -+ int info_ptr_num_palette = 0; -+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) { -+ png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &info_ptr_num_palette); -+ } -+ -+ png_bytep info_ptr_trans_alpha = NULL; -+ int info_ptr_num_trans = 0; -+ png_color_16p info_ptr_trans_color = NULL; -+ -+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { -+ png_get_tRNS(png_ptr, info_ptr, &info_ptr_trans_alpha, &info_ptr_num_trans, &info_ptr_trans_color); -+ } -+#endif /* LIBPNG 1.5 */ -+ - if ( color_type == PNG_COLOR_TYPE_GRAY ) { - // Black & White or 8-bit grayscale -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) -+ if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) { -+#else /* LIBPNG 1.5 */ - if ( bit_depth == 1 && info_ptr->channels == 1 ) { -+#endif /* LIBPNG 1.5 */ - png_set_invert_mono( png_ptr ); - png_read_update_info( png_ptr, info_ptr ); - if (!image.create( width, height, 1, 2, QImage::BigEndian )) -@@ -162,7 +185,9 @@ void setup_qt( QImage& image, png_structp png_ptr, png_infop info_ptr, float scr - image.setColor( i, qRgba(c,c,c,0xff) ); - } - if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { --#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 ) -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) -+ const int g = info_ptr_trans_color->gray; -+#elif ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 ) - const int g = info_ptr->trans_color.gray; - #else - const int g = info_ptr->trans_values.gray; -@@ -175,7 +200,11 @@ void setup_qt( QImage& image, png_structp png_ptr, png_infop info_ptr, float scr - } - } else if ( color_type == PNG_COLOR_TYPE_PALETTE - && png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE) -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) -+ && info_ptr_num_palette <= 256 ) -+#else /* LIBPNG 1.5 */ - && info_ptr->num_palette <= 256 ) -+#endif /* LIBPNG 1.5 */ - { - // 1-bit and 8-bit color - if ( bit_depth != 1 ) -@@ -183,18 +212,33 @@ void setup_qt( QImage& image, png_structp png_ptr, png_infop info_ptr, float scr - png_read_update_info( png_ptr, info_ptr ); - png_get_IHDR(png_ptr, info_ptr, - &width, &height, &bit_depth, &color_type, 0, 0, 0); -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) -+ if (!image.create(width, height, bit_depth, info_ptr_num_palette, -+#else /* LIBPNG 1.5 */ - if (!image.create(width, height, bit_depth, info_ptr->num_palette, -+#endif /* LIBPNG 1.5 */ - QImage::BigEndian)) - return; - int i = 0; - if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { - image.setAlphaBuffer( TRUE ); -+ -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) -+ while ( i < info_ptr_num_trans ) { -+ image.setColor(i, qRgba( -+ info_ptr_palette[i].red, -+ info_ptr_palette[i].green, -+ info_ptr_palette[i].blue, -+#else /* LIBPNG 1.5 */ - while ( i < info_ptr->num_trans ) { - image.setColor(i, qRgba( - info_ptr->palette[i].red, - info_ptr->palette[i].green, - info_ptr->palette[i].blue, --#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 ) -+#endif /* LIBPNG 1.5 */ -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) -+ info_ptr_trans_alpha[i] -+#elif ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 ) - info_ptr->trans_alpha[i] - #else - info_ptr->trans[i] -@@ -204,11 +248,19 @@ void setup_qt( QImage& image, png_structp png_ptr, png_infop info_ptr, float scr - i++; - } - } -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) -+ while ( i < info_ptr_num_palette ) { -+ image.setColor(i, qRgba( -+ info_ptr_palette[i].red, -+ info_ptr_palette[i].green, -+ info_ptr_palette[i].blue, -+#else /* LIBPNG 1.5 */ - while ( i < info_ptr->num_palette ) { - image.setColor(i, qRgba( - info_ptr->palette[i].red, - info_ptr->palette[i].green, - info_ptr->palette[i].blue, -+#endif /* LIBPNG 1.5 */ - 0xff - ) - ); -@@ -295,7 +347,11 @@ void read_png_image(QImageIO* iio) - return; - } - -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) -+ if (setjmp(png_jmpbuf(png_ptr))) { -+#else /* LIBPNG 1.5 */ - if (setjmp(png_ptr->jmpbuf)) { -+#endif /* LIBPNG 1.5 */ - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - iio->setStatus(-4); - return; -@@ -486,7 +542,11 @@ bool QPNGImageWriter::writeImage(const QImage& image, int quality_in, int off_x_ - return FALSE; - } - -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) -+ if (setjmp(png_jmpbuf(png_ptr))) { -+#else /* LIBPNG 1.5 */ - if (setjmp(png_ptr->jmpbuf)) { -+#endif /* LIBPNG 1.5 */ - png_destroy_write_struct(&png_ptr, &info_ptr); - return FALSE; - } -@@ -508,10 +568,18 @@ bool QPNGImageWriter::writeImage(const QImage& image, int quality_in, int off_x_ - - png_set_write_fn(png_ptr, (void*)this, qpiw_write_fn, qpiw_flush_fn); - -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) -+#warning XXXtnn not too sure about this -+/* -+according to png.h, channels is only used on read, not writes, so we -+should be able to comment this out. -+*/ -+#else /* LIBPNG 1.5 */ - info_ptr->channels = - (image.depth() == 32) - ? (image.hasAlphaBuffer() ? 4 : 3) - : 1; -+#endif /* LIBPNG 1.5 */ - - png_set_IHDR(png_ptr, info_ptr, image.width(), image.height(), - image.depth() == 1 ? 1 : 8 /* per channel */, -@@ -521,11 +589,18 @@ bool QPNGImageWriter::writeImage(const QImage& image, int quality_in, int off_x_ - : PNG_COLOR_TYPE_RGB - : PNG_COLOR_TYPE_PALETTE, 0, 0, 0); - -- -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) -+ png_color_8 sig_bit; -+ sig_bit.red = 8; -+ sig_bit.green = 8; -+ sig_bit.blue = 8; -+ png_set_sBIT(png_ptr, info_ptr, &sig_bit); -+#else /* LIBPNG 1.5 */ - //png_set_sBIT(png_ptr, info_ptr, 8); - info_ptr->sig_bit.red = 8; - info_ptr->sig_bit.green = 8; - info_ptr->sig_bit.blue = 8; -+#endif /* LIBPNG 1.5 */ - - if (image.depth() == 1 && image.bitOrder() == QImage::LittleEndian) - png_set_packswap(png_ptr); -@@ -539,11 +614,22 @@ bool QPNGImageWriter::writeImage(const QImage& image, int quality_in, int off_x_ - png_set_PLTE(png_ptr, info_ptr, palette, num_palette); - int* trans = new int[num_palette]; - int num_trans = 0; -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) -+ png_colorp info_ptr_palette = NULL; -+ int tmp; -+ png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &tmp); -+#endif /* LIBPNG 1.5 */ - for (int i=0; i<num_palette; i++) { - QRgb rgb=image.color(i); -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) -+ info_ptr_palette[i].red = qRed(rgb); -+ info_ptr_palette[i].green = qGreen(rgb); -+ info_ptr_palette[i].blue = qBlue(rgb); -+#else /* LIBPNG 1.5 */ - info_ptr->palette[i].red = qRed(rgb); - info_ptr->palette[i].green = qGreen(rgb); - info_ptr->palette[i].blue = qBlue(rgb); -+#endif /* LIBPNG 1.5 */ - if (image.hasAlphaBuffer()) { - trans[i] = rgb >> 24; - if (trans[i] < 255) { -@@ -551,6 +637,9 @@ bool QPNGImageWriter::writeImage(const QImage& image, int quality_in, int off_x_ - } - } - } -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) -+ png_set_PLTE(png_ptr, info_ptr, info_ptr_palette, num_palette); -+#endif /* LIBPNG 1.5 */ - if (num_trans) { - copy_trans = new png_byte[num_trans]; - for (int i=0; i<num_trans; i++) -@@ -561,7 +650,14 @@ bool QPNGImageWriter::writeImage(const QImage& image, int quality_in, int off_x_ - } - - if ( image.hasAlphaBuffer() ) { -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) -+ png_color_8p sig_bit; -+ png_get_sBIT(png_ptr, info_ptr, &sig_bit); -+ sig_bit->alpha = 8; -+ png_set_sBIT(png_ptr, info_ptr, sig_bit); -+#else /* LIBPNG 1.5 */ - info_ptr->sig_bit.alpha = 8; -+#endif /* LIBPNG 1.5 */ - } - - // Swap ARGB to RGBA (normal PNG format) before saving on -@@ -1047,7 +1143,11 @@ int QPNGFormat::decode(QImage& img, QImageConsumer* cons, - return -1; - } - -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) -+ if (setjmp(png_jmpbuf(png_ptr))) { -+#else /* LIBPNG 1.5 */ - if (setjmp((png_ptr)->jmpbuf)) { -+#endif /* LIBPNG 1.5 */ - png_destroy_read_struct(&png_ptr, &info_ptr, 0); - image = 0; - return -1; -@@ -1074,7 +1174,11 @@ int QPNGFormat::decode(QImage& img, QImageConsumer* cons, - - if ( !png_ptr ) return 0; - -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) -+ if (setjmp(png_jmpbuf(png_ptr))) { -+#else /* LIBPNG 1.5 */ - if (setjmp(png_ptr->jmpbuf)) { -+#endif /* LIBPNG 1.5 */ - png_destroy_read_struct(&png_ptr, &info_ptr, 0); - image = 0; - state = MovieStart; -@@ -1134,7 +1238,11 @@ void QPNGFormat::end(png_structp png, png_infop info) - consumer->frameDone(QPoint(offx,offy),r); - consumer->end(); - state = FrameStart; -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) -+ unused_data = png_process_data_pause(png, 0); -+#else /* LIBPNG 1.5 */ - unused_data = (int)png->buffer_size; // Since libpng doesn't tell us -+#endif /* LIBPNG 1.5 */ - } - - #ifdef PNG_USER_CHUNKS_SUPPORTED diff --git a/redhat/dependencies/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch b/redhat/dependencies/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch deleted file mode 100644 index c5da1ad4c..000000000 --- a/redhat/dependencies/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch +++ /dev/null @@ -1,251 +0,0 @@ ---- qt3/translations/qt_zh-tw.ts.ORI 2011-10-30 09:42:26.000000000 +0100 -+++ qt3/translations/qt_zh-tw.ts 2011-12-18 22:06:58.432615802 +0100 -@@ -115,7 +115,7 @@ - </message> - <message> - <source>Menu</source> -- <translation>Menu</translation> -+ <translation>選單</translation> - </message> - <message> - <source>Help</source> -@@ -337,7 +337,7 @@ - </message> - <message> - <source>A&lpha channel:</source> -- <translation>Alpha 色頻(&L)：</translation> -+ <translation>透明色頻(&L)：</translation> - </message> - <message> - <source>&Basic colors</source> -@@ -429,11 +429,11 @@ - </message> - <message> - <source>Read: %1</source> -- <translation>讀取： %1</translation> -+ <translation>讀取：%1</translation> - </message> - <message> - <source>Write: %1</source> -- <translation>寫入： %1</translation> -+ <translation>寫入：%1</translation> - </message> - <message> - <source>Cancel</source> -@@ -1194,7 +1194,7 @@ - </message> - <message> - <source>Customize...</source> -- <translation>自訂...</translation> -+ <translation>自訂…</translation> - </message> - </context> - <context> -@@ -1264,7 +1264,7 @@ - </message> - <message> - <source><h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for multiplatform GUI &amp; application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants.<br>Qt is also available for embedded devices.</p><p>Qt is a Trolltech product. See <tt>http://www.trolltech.com/qt/</tt> for more information.</p></source> -- <translation><h3>關於 Qt</h3><p>本程式使用 Qt 版本 %1。</p><p>Qt 是用於多平台 GUI 和應用程式開發的 C++ 工具套件。</p><p>Qt 為 MS&nbsp;Windows、Mac&nbsp;OS&nbsp;X、Linux 和所有主要的商用 Unix 變異版本，提供跨平台的單一原始碼可攜性。<br>Qt 也可用於內嵌裝置。</p><p>Qt 是 Trolltech 的產品。如需詳細資訊，請參閱 <tt>http://www.trolltech.com/qt/</tt>。</p></translation> -+ <translation><h3>關於 Qt</h3><p>本程式使用 Qt 版本 %1。</p><p>Qt 是用於多平臺 GUI 和應用程式開發的 C++ 工具套件。</p><p>Qt 為 MS&nbsp;Windows、Mac&nbsp;OS&nbsp;X、Linux 和所有主要的商用 Unix 變異版本，提供跨平臺的單一原始碼可攜性。<br>Qt 也可用於內嵌裝置。</p><p>Qt 是 Trolltech 的產品。如需詳細資訊，請參閱 <tt>http://www.trolltech.com/qt/</tt>。</p></translation> - </message> - </context> - <context> -@@ -1282,7 +1282,7 @@ - </message> - <message> - <source>Aliases: %1</source> -- <translation>別名： %1</translation> -+ <translation>別名：%1</translation> - </message> - <message> - <source>unknown</source> -@@ -1338,7 +1338,7 @@ - </message> - <message> - <source>Browse...</source> -- <translation>瀏覽...</translation> -+ <translation>瀏覽…</translation> - </message> - <message> - <source>Options</source> -@@ -1386,123 +1386,123 @@ - </message> - <message> - <source>A0 (841 x 1189 mm)</source> -- <translation>A0 (841 x 1189 mm)</translation> -+ <translation>A0 (841 x 1189 公釐)</translation> - </message> - <message> - <source>A1 (594 x 841 mm)</source> -- <translation>A1 (594 x 841 mm)</translation> -+ <translation>A1 (594 x 841 公釐)</translation> - </message> - <message> - <source>A2 (420 x 594 mm)</source> -- <translation>A2 (420 x 594 mm)</translation> -+ <translation>A2 (420 x 594 公釐)</translation> - </message> - <message> - <source>A3 (297 x 420 mm)</source> -- <translation>A3 (297 x 420 mm)</translation> -+ <translation>A3 (297 x 420 公釐)</translation> - </message> - <message> - <source>A4 (210x297 mm, 8.26x11.7 inches)</source> -- <translation>A4 (210x297 mm，8.26x11.7 英吋)</translation> -+ <translation>A4 (210x297 公釐，8.26x11.7 英吋)</translation> - </message> - <message> - <source>A5 (148 x 210 mm)</source> -- <translation>A5 (148 x 210 mm)</translation> -+ <translation>A5 (148 x 210 公釐)</translation> - </message> - <message> - <source>A6 (105 x 148 mm)</source> -- <translation>A6 (105 x 148 mm)</translation> -+ <translation>A6 (105 x 148 公釐)</translation> - </message> - <message> - <source>A7 (74 x 105 mm)</source> -- <translation>A7 (74 x 105 mm)</translation> -+ <translation>A7 (74 x 105 公釐)</translation> - </message> - <message> - <source>A8 (52 x 74 mm)</source> -- <translation>A8 (52 x 74 mm)</translation> -+ <translation>A8 (52 x 74 公釐)</translation> - </message> - <message> - <source>A9 (37 x 52 mm)</source> -- <translation>A9 (37 x 52 mm)</translation> -+ <translation>A9 (37 x 52 公釐)</translation> - </message> - <message> - <source>B0 (1000 x 1414 mm)</source> -- <translation>B0 (1000 x 1414 mm)</translation> -+ <translation>B0 (1000 x 1414 公釐)</translation> - </message> - <message> - <source>B1 (707 x 1000 mm)</source> -- <translation>B1 (707 x 1000 mm)</translation> -+ <translation>B1 (707 x 1000 公釐)</translation> - </message> - <message> - <source>B2 (500 x 707 mm)</source> -- <translation>B2 (500 x 707 mm)</translation> -+ <translation>B2 (500 x 707 公釐)</translation> - </message> - <message> - <source>B3 (353 x 500 mm)</source> -- <translation>B3 (353 x 500 mm)</translation> -+ <translation>B3 (353 x 500 公釐)</translation> - </message> - <message> - <source>B4 (250 x 353 mm)</source> -- <translation>B4 (250 x 353 mm)</translation> -+ <translation>B4 (250 x 353 公釐)</translation> - </message> - <message> - <source>B5 (176 x 250 mm, 6.93x9.84 inches)</source> -- <translation>B5 (176 x 250 mm，6.93x9.84 英吋)</translation> -+ <translation>B5 (176 x 250 公釐，6.93x9.84 英吋)</translation> - </message> - <message> - <source>B6 (125 x 176 mm)</source> -- <translation>B6 (125 x 176 mm)</translation> -+ <translation>B6 (125 x 176 公釐)</translation> - </message> - <message> - <source>B7 (88 x 125 mm)</source> -- <translation>B7 (88 x 125 mm)</translation> -+ <translation>B7 (88 x 125 公釐)</translation> - </message> - <message> - <source>B8 (62 x 88 mm)</source> -- <translation>B8 (62 x 88 mm)</translation> -+ <translation>B8 (62 x 88 公釐)</translation> - </message> - <message> - <source>B9 (44 x 62 mm)</source> -- <translation>B9 (44 x 62 mm)</translation> -+ <translation>B9 (44 x 62 公釐)</translation> - </message> - <message> - <source>B10 (31 x 44 mm)</source> -- <translation>B10 (31 x 44 mm)</translation> -+ <translation>B10 (31 x 44 公釐)</translation> - </message> - <message> - <source>C5E (163 x 229 mm)</source> -- <translation>C5E (163 x 229 mm)</translation> -+ <translation>C5E (163 x 229 公釐)</translation> - </message> - <message> - <source>DLE (110 x 220 mm)</source> -- <translation>DLE (110 x 220 mm)</translation> -+ <translation>DLE (110 x 220 公釐)</translation> - </message> - <message> - <source>Executive (7.5x10 inches, 191x254 mm)</source> -- <translation>Executive (7.5x10 英吋，191x254 mm)</translation> -+ <translation>Executive (7.5x10 英吋，191x254 公釐)</translation> - </message> - <message> - <source>Folio (210 x 330 mm)</source> -- <translation>Folio (210 x 330 mm)</translation> -+ <translation>Folio (210 x 330 公釐)</translation> - </message> - <message> - <source>Ledger (432 x 279 mm)</source> -- <translation>Ledger (432 x 279 mm)</translation> -+ <translation>Ledger (432 x 279 公釐)</translation> - </message> - <message> - <source>Legal (8.5x14 inches, 216x356 mm)</source> -- <translation>Legal (8.5x14 英吋，216x356 mm)</translation> -+ <translation>Legal (8.5x14 英吋，216x356 公釐)</translation> - </message> - <message> - <source>Letter (8.5x11 inches, 216x279 mm)</source> -- <translation>Letter (8.5x11 英吋，216x279 mm)</translation> -+ <translation>Letter (8.5x11 英吋，216x279 公釐)</translation> - </message> - <message> - <source>Tabloid (279 x 432 mm)</source> -- <translation>Tabloid (279 x 432 mm)</translation> -+ <translation>Tabloid (279 x 432 公釐)</translation> - </message> - <message> - <source>US Common #10 Envelope (105 x 241 mm)</source> -- <translation>美國一般 10 號信封 (105 x 241 mm)</translation> -+ <translation>美國一般 10 號信封 (105 x 241 公釐)</translation> - </message> - <message> - <source>Setup Printer</source> -@@ -1691,7 +1691,7 @@ - <name>QToolBar</name> - <message> - <source>More...</source> -- <translation>其他...</translation> -+ <translation>其他…</translation> - </message> - </context> - <context> -@@ -1811,7 +1811,7 @@ - </message> - <message> - <source>&Help</source> -- <translation>說明(&H)</translation> -+ <translation>求助(&H)</translation> - </message> - </context> - <context> -@@ -1988,7 +1988,7 @@ - </message> - <message> - <source>Paste special...</source> -- <translation>選擇性貼上...</translation> -+ <translation>選擇性貼上…</translation> - </message> - <message> - <source>Clear</source> diff --git a/redhat/dependencies/qt3/qt3-3.3.8.d.spec b/redhat/dependencies/qt3/qt3-3.3.8.d.spec deleted file mode 100644 index 9d61f454d..000000000 --- a/redhat/dependencies/qt3/qt3-3.3.8.d.spec +++ /dev/null @@ -1,702 +0,0 @@ -# Always install under standard prefix -%define _prefix /usr - -# This allows the legacy RHEL/Fedora patches to apply in TDE version. -%define _default_patch_fuzz 2 - -# The following QT4 packages should NOT be installed to -# allow QT3 compilation (please uninstall them prior to compile) -# qt -# qt-sqlite -# qt-mysql -# qt-x11 -# qt-devel -# ...maybe others !!!! - -Name: qt3 -Epoch: 1 -Version: 3.3.8.d -Release: 8%{?dist} -Summary: The shared library for the Qt 3 GUI toolkit - -License: QPL or GPLv2 or GPLv3 -Group: System Environment/Libraries -URL: http://www.trinitydesktop.org/ - -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: qt3-3.3.8.d.tar.gz -Source2: qt.sh -Source3: qt.csh -Source4: designer3.desktop -Source5: assistant3.desktop -Source6: linguist3.desktop -Source7: qtconfig3.desktop - -Patch1: qt-3.3.4-print-CJK.patch -Patch2: qt-3.0.5-nodebug.patch -Patch3: qt-3.1.0-makefile.patch -Patch4: qt-x11-free-3.3.7-umask.patch -Patch5: qt-x11-free-3.3.6-strip.patch -Patch7: qt-x11-free-3.3.2-quiet.patch -Patch12: qt-uic-nostdlib.patch -Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch -Patch25: qt-x11-free-3.3.8b-uic-multilib.patch -Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch -Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch -Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch -Patch32: qt-3.3.6-fontrendering-214371.patch -Patch33: qt-3.3.8-fontrendering-#214570.patch -Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch -Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch -Patch37: qt-3.3.6-fontrendering-gu-228452.patch -Patch38: qt-x11-free-3.3.8-odbc.patch -Patch39: qt-x11-free-3.3.7-arm.patch -Patch40: qt-x11-free-3.3.8b-typo.patch - -# immodule patches -Patch53: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch - -# qt-copy patches -Patch110: 0084-compositing-properties.patch - -# upstream patches -Patch200: qt-x11-free-3.3.4-fullscreen.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 - -%define qt_dirname qt-3.3 -%define qtdir %{_libdir}/%{qt_dirname} -%define qt_docdir %{_docdir}/qt-devel-%{version} - -%define smp 1 -%define immodule 1 -%define debug 0 - -# MySQL plugins -%define plugin_mysql -plugin-sql-mysql -%define mysql_include_dir %{_includedir}/mysql -%define mysql_lib_dir %{_libdir}/mysql - -# Postgres plugins -%define plugin_psql -plugin-sql-psql - -# ODBC plugins -%define plugin_odbc -plugin-sql-odbc - -# sqlite plugins -%define plugin_sqlite -plugin-sql-sqlite - -%define plugins_style -qt-style-cde -qt-style-motifplus -qt-style-platinum -qt-style-sgi -qt-style-windows -qt-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng -%define plugins %{plugin_mysql} %{plugin_psql} %{plugin_odbc} %{plugin_sqlite} %{plugins_style} - -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -Requires: coreutils -Requires: fontconfig >= 2.0 -Requires: /etc/ld.so.conf.d - -BuildRequires: desktop-file-utils -BuildRequires: libmng-devel -BuildRequires: glibc-devel -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: zlib-devel -BuildRequires: perl -BuildRequires: sed -BuildRequires: findutils -BuildRequires: cups-devel -BuildRequires: tar -BuildRequires: freetype-devel -BuildRequires: fontconfig-devel -BuildRequires: desktop-file-utils -BuildRequires: mysql-devel -BuildRequires: postgresql-devel -BuildRequires: unixODBC-devel -BuildRequires: sqlite-devel -BuildRequires: gcc-c++ -BuildRequires: make - -%if 0%{?rhel} == 4 -BuildRequires: libungif-devel -BuildRequires: xorg-x11-devel -%else -BuildRequires: giflib-devel -BuildRequires: libXrender-devel -BuildRequires: libXrandr-devel -BuildRequires: libXcursor-devel -BuildRequires: libXinerama-devel -BuildRequires: libXft-devel -BuildRequires: libXext-devel -BuildRequires: libX11-devel -BuildRequires: libSM-devel -BuildRequires: libICE-devel -BuildRequires: libXt-devel -BuildRequires: libXmu-devel -BuildRequires: libXi-devel -BuildRequires: xorg-x11-proto-devel -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel -%endif - - -%package config -Summary: Graphical configuration tool for programs using Qt 3 -Group: User Interface/Desktops -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-config < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-config = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - - -%package devel -Summary: Development files for the Qt 3 GUI toolkit -Group: Development/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: freetype-devel -Requires: fontconfig-devel -Requires: libpng-devel -Requires: libjpeg-devel -Requires: libmng-devel -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-devel -%else -Requires: libXrender-devel -Requires: libXrandr-devel -Requires: libXcursor-devel -Requires: libXinerama-devel -Requires: libXft-devel -Requires: libXext-devel -Requires: libX11-devel -Requires: libSM-devel -Requires: libICE-devel -Requires: libXt-devel -Requires: xorg-x11-proto-devel -Requires: mesa-libGL-devel -Requires: mesa-libGLU-devel -%endif -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-devel < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-devel = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -%package devel-docs -Summary: Documentation for the Qt 3 GUI toolkit -Group: Development/Libraries -Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-devel-docs < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-devel-docs = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -%package ODBC -Summary: ODBC drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-ODBC < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-ODBC = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -%package MySQL -Summary: MySQL drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-MySQL < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-MySQL = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -%package PostgreSQL -Summary: PostgreSQL drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-PostgreSQL < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-PostgreSQL = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -%package sqlite -Summary: sqlite drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-sqlite < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-sqlite = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - - -%package designer -Summary: Interface designer (IDE) for the Qt 3 toolkit -Group: Development/Tools -Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-designer < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-designer = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - - -%description -Qt is a GUI software toolkit which simplifies the task of writing and -maintaining GUI (Graphical User Interface) applications -for the X Window System. - -Qt is written in C++ and is fully object-oriented. - -This package contains the shared library needed to run Qt 3 -applications, as well as the README files for Qt 3. - - -%description config -Qt is a GUI software toolkit which simplifies the task of writing and -maintaining GUI (Graphical User Interface) applications -for the X Window System. - -Qt is written in C++ and is fully object-oriented. - -This package contains a graphical configuration tool for programs using Qt 3. - - -%description devel -The %{name}-devel package contains the files necessary to develop -applications using the Qt GUI toolkit: the header files, the Qt meta -object compiler. - -Install %{name}-devel if you want to develop GUI applications using the Qt 3 -toolkit. - - -%description devel-docs -The %{name}-devel-docs package contains the man pages, the HTML documentation and -example programs for Qt 3. - - -%description ODBC -ODBC driver for Qt 3's SQL classes (QSQL) - - -%description MySQL -MySQL driver for Qt 3's SQL classes (QSQL) - - -%description PostgreSQL -PostgreSQL driver for Qt 3's SQL classes (QSQL) - - -%description sqlite -sqlite driver for Qt 3's SQL classes (QSQL) - - -%description designer -The %{name}-designer package contains an User Interface designer tool -for the Qt 3 toolkit. - - -%prep -%setup -q -n qt3 -%patch1 -p1 -b .cjk -%patch2 -p1 -b .ndebug -%patch3 -p1 -b .makefile -%patch4 -p1 -b .umask -%patch5 -p1 -%patch7 -p1 -b .quiet -%patch12 -p1 -b .nostdlib -%patch13 -p1 -b .fonts -%patch25 -p1 -b .uic-multilib -%patch27 -p1 -b .fontrendering-ml_IN-bz#209097 -%patch29 -p1 -b .fontrendering-as_IN-bz#209972 -%patch31 -p1 -b .fontrendering-te_IN-bz#211259 -%patch32 -p1 -b .fontrendering-bz#214371 -%patch33 -p1 -b .fontrendering-#214570 -%patch34 -p1 -b .fontrendering-#209974 -%patch35 -p1 -b .fontrendering-ml_IN-217657 -%patch37 -p1 -b .fontrendering-gu-228452 -%patch38 -p1 -b .odbc -# it's not 100% clear to me if this is safe for all archs -- Rex -%ifarch armv5tel -%patch39 -p1 -b .arm -%endif -%patch40 -p1 - -# immodule patches -%if %{immodule} -%patch53 -p1 -b .resetinputcontext -%endif - -# qt-copy patches -%patch110 -p0 -b .0084-compositing-properties - -# upstream patches -%patch200 -p1 -b .fullscreen - -# TDE 3.5.13 patches -%patch300 -p1 -%patch301 -p1 - -# convert to UTF-8 -iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_ -mv doc/man/man3/qdial.3qt_ doc/man/man3/qdial.3qt - -%build -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" -export QTDEST=%{qtdir} - -# Huho ... it looks like we are not detecting some libraries correctly under RHEL4 ... -%if 0%{?rhel} == 4 -%__sed -i plugins/src/inputmethods/xim/xim.pro \ - -e "/INCLUDEPATH/ s|$| /usr/include/freetype2|" -%endif - -%if %{smp} - export SMP_MFLAGS="%{?_smp_mflags}" -%endif - -%if %{immodule} - sh ./make-symlinks.sh -%endif - -# set correct X11 prefix -if [ -d /usr/X11R6 ]; then - perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=/usr/X11R6/%{_lib}," mkspecs/*/qmake.conf - perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=/usr/X11R6/include," mkspecs/*/qmake.conf -else - perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=," mkspecs/*/qmake.conf - perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=," mkspecs/*/qmake.conf -fi -perl -pi -e "s,QMAKE_INCDIR_OPENGL.*,QMAKE_INCDIR_OPENGL\t=," mkspecs/*/qmake.conf -perl -pi -e "s,QMAKE_LIBDIR_OPENGL.*,QMAKE_LIBDIR_OPENGL\t=," mkspecs/*/qmake.conf - -# don't use rpath -perl -pi -e "s|-Wl,-rpath,| |" mkspecs/*/qmake.conf - -perl -pi -e "s|-O2|$INCLUDES %{optflags} -fno-strict-aliasing|g" mkspecs/*/qmake.conf - -# set correct lib path -if [ "%{_lib}" == "lib64" ] ; then - perl -pi -e "s,/usr/lib /lib,/usr/%{_lib} /%{_lib},g" config.tests/{unix,x11}/*.test - perl -pi -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test -fi - -# build shared, threaded (default) libraries -echo yes | ./configure \ - -prefix $QTDEST \ - -docdir %{qt_docdir} \ -%if %{_lib} == lib64 - -platform linux-g++-64 \ -%else - -platform linux-g++ \ -%endif -%if %{debug} - -debug \ -%else - -release \ -%endif - -shared \ - -largefile \ - -qt-gif \ - -system-zlib \ - -system-libpng \ - -system-libmng \ - -system-libjpeg \ - -no-exceptions \ - -enable-styles \ - -enable-tools \ - -enable-kernel \ - -enable-widgets \ - -enable-dialogs \ - -enable-iconview \ - -enable-workspace \ - -enable-network \ - -enable-canvas \ - -enable-table \ - -enable-xml \ - -enable-opengl \ - -enable-sql \ - -qt-style-motif \ - %{plugins} \ - -stl \ - -thread \ - -cups \ - -sm \ -%if 0%{?rhel} == 4 - -no-xinerama \ - -no-xrandr \ -%else - -xinerama \ - -xrandr \ -%endif - -xrender \ - -xkb \ - -ipv6 \ - -dlopen-opengl \ - -xft \ - -tablet -v - -make $SMP_MFLAGS src-qmake - -# build sqlite plugin -pushd plugins/src/sqldrivers/sqlite -qmake -o Makefile sqlite.pro -popd - -# build psql plugin -pushd plugins/src/sqldrivers/psql -qmake -o Makefile "INCLUDEPATH+=%{_includedir}/pgsql %{_includedir}/pgsql/server %{_includedir}/pgsql/internal" "LIBS+=-lpq" psql.pro -popd - -# build mysql plugin -pushd plugins/src/sqldrivers/mysql -qmake -o Makefile "INCLUDEPATH+=%{mysql_include_dir}" "LIBS+=-L%{mysql_lib_dir} -lmysqlclient" mysql.pro -popd - -# build odbc plugin -pushd plugins/src/sqldrivers/odbc -qmake -o Makefile "LIBS+=-lodbc" odbc.pro -popd - -make $SMP_MFLAGS src-moc -make $SMP_MFLAGS sub-src -make $SMP_MFLAGS sub-tools UIC="$QTDIR/bin/uic -nostdlib -L $QTDIR/plugins" - -%install -rm -rf %{buildroot} - -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" -export QTDEST=%{qtdir} - -make install INSTALL_ROOT=%{buildroot} - -for i in findtr qt20fix qtrename140 lrelease lupdate ; do - install bin/$i %{buildroot}%{qtdir}/bin/ -done - -mkdir -p %{buildroot}%{_libdir}/pkgconfig/ -mv %{buildroot}%{qtdir}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/ - -# install man pages -mkdir -p %{buildroot}%{_mandir} -cp -fR doc/man/* %{buildroot}%{_mandir}/ - -# clean up -make -C tutorial clean -make -C examples clean - -# Make sure the examples can be built outside the source tree. -# Our binaries fulfill all requirements, so... -perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `find examples -name "*.pro"` - -# don't include Makefiles of qt examples/tutorials -find examples -name "Makefile" | xargs rm -f -find examples -name "*.obj" | xargs rm -rf -find examples -name "*.moc" | xargs rm -rf -find tutorial -name "Makefile" | xargs rm -f - -for a in */*/Makefile ; do - sed 's|^SYSCONF_MOC.*|SYSCONF_MOC = %{qtdir}/bin/moc|' < $a > ${a}.2 - mv -v ${a}.2 $a -done - -mkdir -p %{buildroot}/etc/profile.d -install -m 644 %{SOURCE2} %{SOURCE3} %{buildroot}/etc/profile.d/ - -# Add desktop files -mkdir -p %{buildroot}%{_datadir}/applications -desktop-file-install \ - --dir %{buildroot}%{_datadir}/applications \ - --vendor="qt" \ - %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} - -# Patch qmake to use qt-mt unconditionally -perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" %{buildroot}%{qtdir}/mkspecs/*/qmake.conf - -# remove broken links -rm -f %{buildroot}%{qtdir}/mkspecs/default/linux-g++* -rm -f %{buildroot}%{qtdir}/lib/*.la - -mkdir -p %{buildroot}/etc/ld.so.conf.d -echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/qt-%{_arch}.conf - -# install icons -mkdir %{buildroot}%{_datadir}/pixmaps -install -m 644 tools/assistant/images/qt.png %{buildroot}%{_datadir}/pixmaps/qtconfig3.png -install -m 644 tools/assistant/images/designer.png %{buildroot}%{_datadir}/pixmaps/designer3.png -install -m 644 tools/assistant/images/assistant.png %{buildroot}%{_datadir}/pixmaps/assistant3.png -install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixmaps/linguist3.png - -# own style directory -mkdir -p %{buildroot}%{qtdir}/plugins/styles - -%clean -rm -rf %{buildroot} - -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig - -%files -%defattr(-,root,root,-) -%doc FAQ LICENSE* README* changes* -%dir %{qtdir} -%dir %{qtdir}/bin -%dir %{qtdir}/lib -%dir %{qtdir}/plugins -%dir %{qtdir}/plugins/sqldrivers -%dir %{qtdir}/plugins/styles -%{qtdir}/translations -%{qtdir}/plugins/designer/ -%if %{immodule} -%{qtdir}/plugins/inputmethods -%endif -%config /etc/profile.d/* -/etc/ld.so.conf.d/* -%{qtdir}/lib/libqui.so.* -%{qtdir}/lib/libqt*.so.* - -%files config -%defattr(-,root,root,-) -%{qtdir}/bin/qtconfig -%{_datadir}/applications/*qtconfig*.desktop -%{_datadir}/pixmaps/qtconfig3.png - -%files devel -%defattr(-,root,root,-) -%{qt_docdir}/ -%{qtdir}/bin/moc -%{qtdir}/bin/uic -%{qtdir}/bin/findtr -%{qtdir}/bin/qt20fix -%{qtdir}/bin/qtrename140 -%{qtdir}/bin/assistant -%{qtdir}/bin/qm2ts -%{qtdir}/bin/qmake -%{qtdir}/bin/qembed -%{qtdir}/bin/linguist -%{qtdir}/bin/lupdate -%{qtdir}/bin/lrelease -%{qtdir}/include -%{qtdir}/mkspecs -%{qtdir}/lib/libqt*.so -%{qtdir}/lib/libqui.so -%{qtdir}/lib/libeditor.a -%{qtdir}/lib/libdesigner*.a -%{qtdir}/lib/libqassistantclient.a -%{qtdir}/lib/*.prl -%{qtdir}/phrasebooks -%{_libdir}/pkgconfig/* -%{_datadir}/applications/*linguist*.desktop -%{_datadir}/applications/*assistant*.desktop -%{_datadir}/pixmaps/linguist3.png -%{_datadir}/pixmaps/assistant3.png - -# QT 3.3.8.D (TDE): 4 binaries have appeared -%{qtdir}/bin/createcw -%{qtdir}/bin/makeqpf -%{qtdir}/bin/mergetr -%{qtdir}/bin/msg2qm - -# QT 3.3.8.D (TDE): removes lots of unnecessary include files -# (where do they come from ??? They were not in 3.3.8b !) -%exclude %{qtdir}/include/btree.h -%exclude %{qtdir}/include/crc32.h -%exclude %{qtdir}/include/debian_qsql_odbc.h -%exclude %{qtdir}/include/deflate.h -%exclude %{qtdir}/include/ftglue.h -%exclude %{qtdir}/include/ftxgdef.h -%exclude %{qtdir}/include/ftxgpos.h -%exclude %{qtdir}/include/ftxgsub.h -%exclude %{qtdir}/include/ftxopen.h -%exclude %{qtdir}/include/ftxopenf.h -%exclude %{qtdir}/include/hash.h -%exclude %{qtdir}/include/inffast.h -%exclude %{qtdir}/include/inffixed.h -%exclude %{qtdir}/include/inflate.h -%exclude %{qtdir}/include/inftrees.h -%exclude %{qtdir}/include/moc_yacc.h -%exclude %{qtdir}/include/opcodes.h -%exclude %{qtdir}/include/os.h -%exclude %{qtdir}/include/otlbuffer.h -%exclude %{qtdir}/include/pager.h -%exclude %{qtdir}/include/parse.h -%exclude %{qtdir}/include/pngasmrd.h -%exclude %{qtdir}/include/pngconf.h -%exclude %{qtdir}/include/sqlite.h -%exclude %{qtdir}/include/sqliteInt.h -%exclude %{qtdir}/include/trees.h -%exclude %{qtdir}/include/vdbe.h -%exclude %{qtdir}/include/vdbeInt.h -%exclude %{qtdir}/mkspecs/linux-g++-sparc - - - -%files devel-docs -%defattr(-,root,root,-) -%doc examples -%doc tutorial -%{_mandir}/*/* - -%files sqlite -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlite.so - -%files ODBC -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlodbc.so - -%files PostgreSQL -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlpsql.so - -%files MySQL -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlmysql.so - -%files designer -%defattr(-,root,root,-) -%{qtdir}/templates -%{qtdir}/bin/designer -%{_datadir}/applications/*designer*.desktop -%{_datadir}/pixmaps/designer3.png - - -%changelog -* Sat Apr 28 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-8 -- Fix Provides and Obsoletes, again and again ... - -* Sat Apr 28 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-7 -- Fix Provides and Obsoletes. Now only for RHEL 5. - -* Tue Apr 24 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-6 -- Fix Qt3 builds with libpng15. [Bug #683] - -* Sat Apr 21 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-5 -- Fix 'Provides' AGAIN !! [Bug #823] - -* Mon Apr 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-4 -- Fix 'Provides' [Bug #823] - -* Sun Dec 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-3 -- Updates zh_TW translations, thanks to Wei-Lun Chao . - -* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-2 -- Add missing BuildRequires - -* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-1 -- Initial release for RHEL 6, RHEL 5, and Fedora 15 -- Switch to Trinity Version -- Spec file based on RHEL 6 'qt3-3.3.8b-29' diff --git a/redhat/dependencies/qt3/qt3-3.5.13.1.spec b/redhat/dependencies/qt3/qt3-3.5.13.1.spec deleted file mode 100644 index 9fa6ee8ac..000000000 --- a/redhat/dependencies/qt3/qt3-3.5.13.1.spec +++ /dev/null @@ -1,699 +0,0 @@ -# Always install under standard prefix -%define _prefix /usr - -# The following QT4 packages should NOT be installed to -# allow QT3 compilation (please uninstall them prior to compile) -# qt -# qt-sqlite -# qt-mysql -# qt-x11 -# qt-devel -# ...maybe others !!!! - -Name: qt3 -Epoch: 1 -Version: 3.3.8.d -Release: 9%{?dist} -Summary: The shared library for the Qt 3 GUI toolkit - -License: QPL or GPLv2 or GPLv3 -Group: System Environment/Libraries -URL: http://www.trinitydesktop.org/ - -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: qt3-3.5.13.1.tar.gz -Source2: qt.sh -Source3: qt.csh -Source4: designer3.desktop -Source5: assistant3.desktop -Source6: linguist3.desktop -Source7: qtconfig3.desktop - -Patch1: qt-3.3.4-print-CJK.patch -Patch2: qt-3.0.5-nodebug.patch -Patch3: qt-3.1.0-makefile.patch -Patch4: qt-x11-free-3.3.7-umask.patch -Patch5: qt-x11-free-3.3.6-strip.patch -Patch7: qt-x11-free-3.3.2-quiet.patch -Patch12: qt-uic-nostdlib.patch -Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch -Patch25: qt-x11-free-3.3.8b-uic-multilib.patch -Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch -Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch -Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch -Patch32: qt-3.3.6-fontrendering-214371.patch -Patch33: qt-3.3.8-fontrendering-#214570.patch -Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch -Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch -Patch37: qt-3.3.6-fontrendering-gu-228452.patch -Patch38: qt-x11-free-3.3.8-odbc.patch -Patch39: qt-x11-free-3.3.7-arm.patch -Patch40: qt-x11-free-3.3.8b-typo.patch - -# immodule patches -Patch53: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch - -# qt-copy patches -Patch110: 0084-compositing-properties.patch - -# upstream patches -Patch200: qt-x11-free-3.3.4-fullscreen.patch - -# TDE 3.5.13 patches -Patch300: qt3-3.3.8.d-updates_zh-tw_translations.patch - -%define qt_dirname qt-3.3 -%define qtdir %{_libdir}/%{qt_dirname} -%define qt_docdir %{_docdir}/qt-devel-%{version} - -%define smp 1 -%define immodule 1 -%define debug 0 - -# MySQL plugins -%define plugin_mysql -plugin-sql-mysql -%define mysql_include_dir %{_includedir}/mysql -%define mysql_lib_dir %{_libdir}/mysql - -# Postgres plugins -%define plugin_psql -plugin-sql-psql - -# ODBC plugins -%define plugin_odbc -plugin-sql-odbc - -# sqlite plugins -%define plugin_sqlite -plugin-sql-sqlite - -%define plugins_style -qt-style-cde -qt-style-motifplus -qt-style-platinum -qt-style-sgi -qt-style-windows -qt-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng -%define plugins %{plugin_mysql} %{plugin_psql} %{plugin_odbc} %{plugin_sqlite} %{plugins_style} - -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -Requires: coreutils -Requires: fontconfig >= 2.0 -Requires: /etc/ld.so.conf.d - -BuildRequires: desktop-file-utils -BuildRequires: libmng-devel -BuildRequires: glibc-devel -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: zlib-devel -BuildRequires: perl -BuildRequires: sed -BuildRequires: findutils -BuildRequires: cups-devel -BuildRequires: tar -BuildRequires: freetype-devel -BuildRequires: fontconfig-devel -BuildRequires: desktop-file-utils -BuildRequires: mysql-devel -BuildRequires: postgresql-devel -BuildRequires: unixODBC-devel -BuildRequires: sqlite-devel -BuildRequires: gcc-c++ -BuildRequires: make - -%if 0%{?rhel} == 4 -BuildRequires: libungif-devel -BuildRequires: xorg-x11-devel -%else -BuildRequires: giflib-devel -BuildRequires: libXrender-devel -BuildRequires: libXrandr-devel -BuildRequires: libXcursor-devel -BuildRequires: libXinerama-devel -BuildRequires: libXft-devel -BuildRequires: libXext-devel -BuildRequires: libX11-devel -BuildRequires: libSM-devel -BuildRequires: libICE-devel -BuildRequires: libXt-devel -BuildRequires: libXmu-devel -BuildRequires: libXi-devel -BuildRequires: xorg-x11-proto-devel -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel -%endif - - -%package config -Summary: Graphical configuration tool for programs using Qt 3 -Group: User Interface/Desktops -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-config < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-config = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - - -%package devel -Summary: Development files for the Qt 3 GUI toolkit -Group: Development/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: freetype-devel -Requires: fontconfig-devel -Requires: libpng-devel -Requires: libjpeg-devel -Requires: libmng-devel -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-devel -%else -Requires: libXrender-devel -Requires: libXrandr-devel -Requires: libXcursor-devel -Requires: libXinerama-devel -Requires: libXft-devel -Requires: libXext-devel -Requires: libX11-devel -Requires: libSM-devel -Requires: libICE-devel -Requires: libXt-devel -Requires: xorg-x11-proto-devel -Requires: mesa-libGL-devel -Requires: mesa-libGLU-devel -%endif -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-devel < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-devel = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -%package devel-docs -Summary: Documentation for the Qt 3 GUI toolkit -Group: Development/Libraries -Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-devel-docs < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-devel-docs = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -%package ODBC -Summary: ODBC drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-ODBC < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-ODBC = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -%package MySQL -Summary: MySQL drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-MySQL < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-MySQL = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -%package PostgreSQL -Summary: PostgreSQL drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-PostgreSQL < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-PostgreSQL = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -%package sqlite -Summary: sqlite drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-sqlite < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-sqlite = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - - -%package designer -Summary: Interface designer (IDE) for the Qt 3 toolkit -Group: Development/Tools -Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-designer < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-designer = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - - -%description -Qt is a GUI software toolkit which simplifies the task of writing and -maintaining GUI (Graphical User Interface) applications -for the X Window System. - -Qt is written in C++ and is fully object-oriented. - -This package contains the shared library needed to run Qt 3 -applications, as well as the README files for Qt 3. - - -%description config -Qt is a GUI software toolkit which simplifies the task of writing and -maintaining GUI (Graphical User Interface) applications -for the X Window System. - -Qt is written in C++ and is fully object-oriented. - -This package contains a graphical configuration tool for programs using Qt 3. - - -%description devel -The %{name}-devel package contains the files necessary to develop -applications using the Qt GUI toolkit: the header files, the Qt meta -object compiler. - -Install %{name}-devel if you want to develop GUI applications using the Qt 3 -toolkit. - - -%description devel-docs -The %{name}-devel-docs package contains the man pages, the HTML documentation and -example programs for Qt 3. - - -%description ODBC -ODBC driver for Qt 3's SQL classes (QSQL) - - -%description MySQL -MySQL driver for Qt 3's SQL classes (QSQL) - - -%description PostgreSQL -PostgreSQL driver for Qt 3's SQL classes (QSQL) - - -%description sqlite -sqlite driver for Qt 3's SQL classes (QSQL) - - -%description designer -The %{name}-designer package contains an User Interface designer tool -for the Qt 3 toolkit. - - -%prep -%setup -q -n qt3-3.5.13.1 - -%patch1 -p1 -b .cjk -%patch2 -p1 -b .ndebug -%patch3 -p1 -b .makefile -%patch4 -p1 -b .umask -%patch5 -p1 -%patch7 -p1 -b .quiet -%patch12 -p1 -b .nostdlib -%patch13 -p1 -b .fonts -%patch25 -p1 -b .uic-multilib -%patch27 -p1 -b .fontrendering-ml_IN-bz#209097 -%patch29 -p1 -b .fontrendering-as_IN-bz#209972 -%patch31 -p1 -b .fontrendering-te_IN-bz#211259 -%patch32 -p1 -b .fontrendering-bz#214371 -%patch33 -p1 -b .fontrendering-#214570 -%patch34 -p1 -b .fontrendering-#209974 -%patch35 -p1 -b .fontrendering-ml_IN-217657 -%patch37 -p1 -b .fontrendering-gu-228452 -%patch38 -p1 -b .odbc -# it's not 100% clear to me if this is safe for all archs -- Rex -%ifarch armv5tel -%patch39 -p1 -b .arm -%endif -%patch40 -p1 - -# immodule patches -%if %{immodule} -%patch53 -p1 -b .resetinputcontext -%endif - -# qt-copy patches -%patch110 -p0 -b .0084-compositing-properties - -# upstream patches -%patch200 -p1 -b .fullscreen - -# TDE 3.5.13 patches -%patch300 -p1 - -# convert to UTF-8 -iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_ -mv doc/man/man3/qdial.3qt_ doc/man/man3/qdial.3qt - -%build -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" -export QTDEST=%{qtdir} - -# Huho ... it looks like we are not detecting some libraries correctly under RHEL4 ... -%if 0%{?rhel} == 4 -%__sed -i plugins/src/inputmethods/xim/xim.pro \ - -e "/INCLUDEPATH/ s|$| /usr/include/freetype2|" -%endif - -%if %{smp} - export SMP_MFLAGS="%{?_smp_mflags}" -%endif - -%if %{immodule} - sh ./make-symlinks.sh -%endif - -# set correct X11 prefix -if [ -d /usr/X11R6 ]; then - perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=/usr/X11R6/%{_lib}," mkspecs/*/qmake.conf - perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=/usr/X11R6/include," mkspecs/*/qmake.conf -else - perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=," mkspecs/*/qmake.conf - perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=," mkspecs/*/qmake.conf -fi -perl -pi -e "s,QMAKE_INCDIR_OPENGL.*,QMAKE_INCDIR_OPENGL\t=," mkspecs/*/qmake.conf -perl -pi -e "s,QMAKE_LIBDIR_OPENGL.*,QMAKE_LIBDIR_OPENGL\t=," mkspecs/*/qmake.conf - -# don't use rpath -perl -pi -e "s|-Wl,-rpath,| |" mkspecs/*/qmake.conf - -perl -pi -e "s|-O2|$INCLUDES %{optflags} -fno-strict-aliasing|g" mkspecs/*/qmake.conf - -# set correct lib path -if [ "%{_lib}" == "lib64" ] ; then - perl -pi -e "s,/usr/lib /lib,/usr/%{_lib} /%{_lib},g" config.tests/{unix,x11}/*.test - perl -pi -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test -fi - -# build shared, threaded (default) libraries -echo yes | ./configure \ - -prefix $QTDEST \ - -docdir %{qt_docdir} \ -%if %{_lib} == lib64 - -platform linux-g++-64 \ -%else - -platform linux-g++ \ -%endif -%if %{debug} - -debug \ -%else - -release \ -%endif - -shared \ - -largefile \ - -qt-gif \ - -system-zlib \ - -system-libpng \ - -system-libmng \ - -system-libjpeg \ - -no-exceptions \ - -enable-styles \ - -enable-tools \ - -enable-kernel \ - -enable-widgets \ - -enable-dialogs \ - -enable-iconview \ - -enable-workspace \ - -enable-network \ - -enable-canvas \ - -enable-table \ - -enable-xml \ - -enable-opengl \ - -enable-sql \ - -qt-style-motif \ - %{plugins} \ - -stl \ - -thread \ - -cups \ - -sm \ -%if 0%{?rhel} == 4 - -no-xinerama \ - -no-xrandr \ -%else - -xinerama \ - -xrandr \ -%endif - -xrender \ - -xkb \ - -ipv6 \ - -dlopen-opengl \ - -xft \ - -tablet -v - -make $SMP_MFLAGS src-qmake - -# build sqlite plugin -pushd plugins/src/sqldrivers/sqlite -qmake -o Makefile sqlite.pro -popd - -# build psql plugin -pushd plugins/src/sqldrivers/psql -qmake -o Makefile "INCLUDEPATH+=%{_includedir}/pgsql %{_includedir}/pgsql/server %{_includedir}/pgsql/internal" "LIBS+=-lpq" psql.pro -popd - -# build mysql plugin -pushd plugins/src/sqldrivers/mysql -qmake -o Makefile "INCLUDEPATH+=%{mysql_include_dir}" "LIBS+=-L%{mysql_lib_dir} -lmysqlclient" mysql.pro -popd - -# build odbc plugin -pushd plugins/src/sqldrivers/odbc -qmake -o Makefile "LIBS+=-lodbc" odbc.pro -popd - -make $SMP_MFLAGS src-moc -make $SMP_MFLAGS sub-src -make $SMP_MFLAGS sub-tools UIC="$QTDIR/bin/uic -nostdlib -L $QTDIR/plugins" - -%install -rm -rf %{buildroot} - -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" -export QTDEST=%{qtdir} - -make install INSTALL_ROOT=%{buildroot} - -for i in findtr qt20fix qtrename140 lrelease lupdate ; do - install bin/$i %{buildroot}%{qtdir}/bin/ -done - -mkdir -p %{buildroot}%{_libdir}/pkgconfig/ -mv %{buildroot}%{qtdir}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/ - -# install man pages -mkdir -p %{buildroot}%{_mandir} -cp -fR doc/man/* %{buildroot}%{_mandir}/ - -# clean up -make -C tutorial clean -make -C examples clean - -# Make sure the examples can be built outside the source tree. -# Our binaries fulfill all requirements, so... -perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `find examples -name "*.pro"` - -# don't include Makefiles of qt examples/tutorials -find examples -name "Makefile" | xargs rm -f -find examples -name "*.obj" | xargs rm -rf -find examples -name "*.moc" | xargs rm -rf -find tutorial -name "Makefile" | xargs rm -f - -for a in */*/Makefile ; do - sed 's|^SYSCONF_MOC.*|SYSCONF_MOC = %{qtdir}/bin/moc|' < $a > ${a}.2 - mv -v ${a}.2 $a -done - -install -D -m 644 %{SOURCE2} %{buildroot}/etc/profile.d/qt3.sh -install -D -m 644 %{SOURCE3} %{buildroot}/etc/profile.d/qt3.csh - -# Add desktop files -mkdir -p %{buildroot}%{_datadir}/applications -desktop-file-install \ - --dir %{buildroot}%{_datadir}/applications \ - --vendor="qt" \ - %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} - -# Patch qmake to use qt-mt unconditionally -perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" %{buildroot}%{qtdir}/mkspecs/*/qmake.conf - -# remove broken links -rm -f %{buildroot}%{qtdir}/mkspecs/default/linux-g++* -rm -f %{buildroot}%{qtdir}/lib/*.la - -mkdir -p %{buildroot}/etc/ld.so.conf.d -echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/qt-%{_arch}.conf - -# install icons -mkdir %{buildroot}%{_datadir}/pixmaps -install -m 644 tools/assistant/images/qt.png %{buildroot}%{_datadir}/pixmaps/qtconfig3.png -install -m 644 tools/assistant/images/designer.png %{buildroot}%{_datadir}/pixmaps/designer3.png -install -m 644 tools/assistant/images/assistant.png %{buildroot}%{_datadir}/pixmaps/assistant3.png -install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixmaps/linguist3.png - -# own style directory -mkdir -p %{buildroot}%{qtdir}/plugins/styles - -%clean -rm -rf %{buildroot} - -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig - -%files -%defattr(-,root,root,-) -%doc FAQ LICENSE* README* changes* -%dir %{qtdir} -%dir %{qtdir}/bin -%dir %{qtdir}/lib -%dir %{qtdir}/plugins -%dir %{qtdir}/plugins/sqldrivers -%dir %{qtdir}/plugins/styles -%{qtdir}/translations -%{qtdir}/plugins/designer/ -%if %{immodule} -%{qtdir}/plugins/inputmethods -%endif -%config /etc/profile.d/* -/etc/ld.so.conf.d/* -%{qtdir}/lib/libqui.so.* -%{qtdir}/lib/libqt*.so.* - -%files config -%defattr(-,root,root,-) -%{qtdir}/bin/qtconfig -%{_datadir}/applications/*qtconfig*.desktop -%{_datadir}/pixmaps/qtconfig3.png - -%files devel -%defattr(-,root,root,-) -%{qt_docdir}/ -%{qtdir}/bin/moc -%{qtdir}/bin/uic -%{qtdir}/bin/findtr -%{qtdir}/bin/qt20fix -%{qtdir}/bin/qtrename140 -%{qtdir}/bin/assistant -%{qtdir}/bin/qm2ts -%{qtdir}/bin/qmake -%{qtdir}/bin/qembed -%{qtdir}/bin/linguist -%{qtdir}/bin/lupdate -%{qtdir}/bin/lrelease -%{qtdir}/include -%{qtdir}/mkspecs -%{qtdir}/lib/libqt*.so -%{qtdir}/lib/libqui.so -%{qtdir}/lib/libeditor.a -%{qtdir}/lib/libdesigner*.a -%{qtdir}/lib/libqassistantclient.a -%{qtdir}/lib/*.prl -%{qtdir}/phrasebooks -%{_libdir}/pkgconfig/* -%{_datadir}/applications/*linguist*.desktop -%{_datadir}/applications/*assistant*.desktop -%{_datadir}/pixmaps/linguist3.png -%{_datadir}/pixmaps/assistant3.png - -# QT 3.3.8.D (TDE): 4 binaries have appeared -%{qtdir}/bin/createcw -%{qtdir}/bin/makeqpf -%{qtdir}/bin/mergetr -%{qtdir}/bin/msg2qm - -# QT 3.3.8.D (TDE): removes lots of unnecessary include files -# (where do they come from ??? They were not in 3.3.8b !) -%exclude %{qtdir}/include/btree.h -%exclude %{qtdir}/include/crc32.h -%exclude %{qtdir}/include/debian_qsql_odbc.h -%exclude %{qtdir}/include/deflate.h -%exclude %{qtdir}/include/ftglue.h -%exclude %{qtdir}/include/ftxgdef.h -%exclude %{qtdir}/include/ftxgpos.h -%exclude %{qtdir}/include/ftxgsub.h -%exclude %{qtdir}/include/ftxopen.h -%exclude %{qtdir}/include/ftxopenf.h -%exclude %{qtdir}/include/hash.h -%exclude %{qtdir}/include/inffast.h -%exclude %{qtdir}/include/inffixed.h -%exclude %{qtdir}/include/inflate.h -%exclude %{qtdir}/include/inftrees.h -%exclude %{qtdir}/include/moc_yacc.h -%exclude %{qtdir}/include/opcodes.h -%exclude %{qtdir}/include/os.h -%exclude %{qtdir}/include/otlbuffer.h -%exclude %{qtdir}/include/pager.h -%exclude %{qtdir}/include/parse.h -%exclude %{qtdir}/include/pngasmrd.h -%exclude %{qtdir}/include/pngconf.h -%exclude %{qtdir}/include/sqlite.h -%exclude %{qtdir}/include/sqliteInt.h -%exclude %{qtdir}/include/trees.h -%exclude %{qtdir}/include/vdbe.h -%exclude %{qtdir}/include/vdbeInt.h -%exclude %{qtdir}/mkspecs/linux-g++-sparc - - - -%files devel-docs -%defattr(-,root,root,-) -%doc examples -%doc tutorial -%{_mandir}/*/* - -%files sqlite -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlite.so - -%files ODBC -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlodbc.so - -%files PostgreSQL -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlpsql.so - -%files MySQL -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlmysql.so - -%files designer -%defattr(-,root,root,-) -%{qtdir}/templates -%{qtdir}/bin/designer -%{_datadir}/applications/*designer*.desktop -%{_datadir}/pixmaps/designer3.png - - -%changelog -* Sat Sep 29 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-9 -- Initial release for TDE 3.5.13.1 - -* Sat Apr 28 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-8 -- Fix Provides and Obsoletes, again and again ... - -* Sat Apr 28 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-7 -- Fix Provides and Obsoletes. Now only for RHEL 5. - -* Tue Apr 24 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-6 -- Fix Qt3 builds with libpng15. [Bug #683] - -* Sat Apr 21 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-5 -- Fix 'Provides' AGAIN !! [Bug #823] - -* Mon Apr 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-4 -- Fix 'Provides' [Bug #823] - -* Sun Dec 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-3 -- Updates zh_TW translations, thanks to Wei-Lun Chao . - -* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-2 -- Add missing BuildRequires - -* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-1 -- Initial release for RHEL 6, RHEL 5, and Fedora 15 -- Switch to Trinity Version -- Spec file based on RHEL 6 'qt3-3.3.8b-29' diff --git a/redhat/dependencies/qt3/qt3-3.5.13.2.patch b/redhat/dependencies/qt3/qt3-3.5.13.2.patch new file mode 100644 index 000000000..6c9a6f8f0 --- /dev/null +++ b/redhat/dependencies/qt3/qt3-3.5.13.2.patch @@ -0,0 +1,516 @@ +commit 1ee1ffbae69dc78721af139f0794628571fd35ef +Author: Slávek Banko <slavek.banko@axis.cz> +Date: 1386900429 +0100 + + Fix FTBFS with libfreetype6 >= 2.5.x + This resolves Bug 1765 + +diff --git a/config.tests/x11/xfreetype.test b/config.tests/x11/xfreetype.test +index 5cabc32..d4cb4ba 100755 +--- a/config.tests/x11/xfreetype.test ++++ b/config.tests/x11/xfreetype.test +@@ -116,12 +116,15 @@ fi + # check for freetype2 headers + FREETYPE2_INCDIR= + if [ "$XFT" = "yes" ]; then +- INC="freetype2/freetype/freetype.h" + XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG` + LDIRS=`sed -n -e '/^QMAKE_INCDIR[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG` + INCDIRS="$IN_INCDIRS $XDIRS $LDIRS /usr/include /include" + F= + for INCDIR in $INCDIRS; do ++ INC="freetype2/freetype/freetype.h" # libfreetype <= 2.4.9-1.1 ++ if ! [ -f $INCDIR/$INC ]; then ++ INC="freetype2/freetype.h" # libfreetype >= 2.5.1-1 ++ fi + if [ -f $INCDIR/$INC ]; then + # detect major version of freetype2 + FREETYPE_MAJOR=`grep "#define FREETYPE_MAJOR" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'` +--- qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp.bero 2002-08-21 15:16:19.000000000 +0200 ++++ qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp 2002-08-21 15:16:41.000000000 +0200 +@@ -501,10 +501,10 @@ + (*f).latin1(), + (const char*) QFile::encodeName( old->library() ) ); + } else { +- qWarning("%s: Feature %s already defined in %s!", ++/* qWarning("%s: Feature %s already defined in %s!", + (const char*) QFile::encodeName( old->library() ), + (*f).latin1(), +- (const char*) QFile::encodeName( plugin->library() ) ); ++ (const char*) QFile::encodeName( plugin->library() ) ); */ + } + } + } +--- qt-x11-free-3.1.0/Makefile.orig 2002-11-14 15:44:17.000000000 +0100 ++++ qt-x11-free-3.1.0/Makefile 2002-11-14 15:49:33.000000000 +0100 +@@ -11,7 +11,7 @@ + install: FORCE + @$(MAKE) qt.install + +-all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples ++all: symlinks src-qmake src-moc sub-src sub-tools + @echo + @echo "The Qt library is now built in ./lib" + @echo "The Qt examples are built in the directories in ./examples" +--- qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp.cjk 2005-01-21 18:16:11.000000000 +0100 ++++ qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp 2005-01-26 15:09:20.911239907 +0100 +@@ -4748,10 +4748,11 @@ + + // GB18030 fonts on Turbolinux + static const psfont SongGBK2K [] = { +- { "MSung-Light-GBK2K-H", 0, 100. }, +- { "MSung-Italic-GBK2K-H", 0, 100. }, +- { "MSung-Bold-GBK2K-H", 0, 100. }, +- { "MSung-BoldItalic-GBK2K-H", 0, 100. }, ++ { "MSungGBK-Light-GBK2K-H", 0, 100. }, ++ { "MSungGBK-Light-GBK2K-H", 0, 100. }, ++ { "MSungGBK-Light-GBK2K-H", 0, 100. }, ++ { "MSungGBK-Light-GBK2K-H", 0, 100. }, ++ + }; + static const psfont KaiGBK2K [] = { + { "MKai-Medium-GBK2K-H", 0, 100. }, +diff -pruN qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp +--- qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp 2006-12-04 18:47:11.000000000 +0530 ++++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-12-05 12:05:10.000000000 +0530 +@@ -1412,7 +1412,10 @@ static bool indic_shape_syllable(QOpenTy + toPos += 2; + if (script == QFont::Devanagari || script == QFont::Gujarati || script == QFont::Bengali) { + if (matra_position == Post || matra_position == Split) { +- toPos = matra+1; ++ if (matra_position == Post ) ++ toPos = matra; ++ else ++ toPos = matra+1; + matra -= 2; + } + } else if (script == QFont::Kannada) { +--- qt3/src/kernel/qscriptengine_x11.cpp.fontrendering-gu-228452 2012-09-29 11:30:23.821539127 +0200 ++++ qt3/src/kernel/qscriptengine_x11.cpp 2012-09-29 11:31:59.679413873 +0200 +@@ -261,7 +261,7 @@ + Other, Other, Other, Other, + Other, Other, Other, Other, + +- Other, Other, Other, Other, ++ Other, Other, VowelMark, VowelMark, + Other, Other, Other, Other, + Other, Other, Other, Other, + Other, Other, Other, Other, +--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-13 13:21:37.000000000 +0800 ++++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-13 13:57:36.000000000 +0800 +@@ -868,7 +868,7 @@ + None, None, None, None, + None, None, None, Post, + +- Post, None, Below, None, ++ None, None, None, None, + None, Post, None, None, + None, None, None, None, + None, None, Post, Post, +@@ -1271,6 +1271,16 @@ + int base = 0; + int reph = -1; + ++ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam ++ bool is_special_conjuction_malayalam = false; ++ ++ if ((len == 3) && ++ ((reordered[2] == 0x0d30) || (reordered[2] == 0x0d31)) && ++ (reordered[1] == 0x0d4d) && ++ ((reordered[0] >= 0x0d15) && (reordered[0] <= 0x0d39))) { ++ is_special_conjuction_malayalam = true; ++ } ++ + #ifdef INDIC_DEBUG + IDEBUG("original:"); + for (i = 0; i < len; i++) { +@@ -1547,6 +1557,15 @@ + reph = i; + } + ++ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam ++ if (is_special_conjuction_malayalam) { ++ unsigned short temp; ++ ++ temp = reordered[0]; ++ reordered[0] = reordered[2]; ++ reordered[2] = temp; ++ } ++ + if (item->font->stringToCMap((const QChar *)reordered.data(), len, item->glyphs, item->advances, + &item->num_glyphs, item->flags & QTextEngine::RightToLeft) != QFontEngine::NoError) + return FALSE; +@@ -1658,6 +1677,15 @@ + + // halant always applies + ++ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam ++ if (is_special_conjuction_malayalam) { ++ unsigned int temp; ++ ++ temp = properties[0]; ++ properties[0] = ~PreSubstProperty; ++ properties[2] = temp; ++ } ++ + #ifdef INDIC_DEBUG + { + IDEBUG("OT properties:"); +--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.orig 2006-11-29 17:17:26.000000000 +0100 ++++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-11-29 17:22:34.000000000 +0100 +@@ -864,7 +864,7 @@ + None, None, None, Post, + + None, None, None, None, +- None, Post, None, None, ++ None, None, None, None, + None, None, None, None, + None, None, Post, Post, + +diff -pruN qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp +--- qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp 2006-03-08 00:00:00.000000000 +0530 ++++ qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp 2006-12-04 18:49:09.000000000 +0530 +@@ -709,7 +709,7 @@ int QFontMetrics::charWidth( const QStri + if ( script >= QFont::Arabic && script <= QFont::Khmer ) { + // complex script shaping. Have to do some hard work + int from = QMAX( 0, pos - 8 ); +- int to = QMIN( (int)str.length(), pos + 8 ); ++ int to = str.length(); + QConstString cstr( str.unicode()+from, to-from); + QTextEngine layout( cstr.string(), d ); + layout.itemize( QTextEngine::WidthOnly ); +--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-18 17:55:23.000000000 +0800 ++++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-19 16:42:31.641160984 +0800 +@@ -786,7 +786,7 @@ + Below, None, Below, Below, + Below, Below, Below, Below, + +- Below, None, Below, Below, ++ Below, Below, Below, Below, + None, Below, Below, Below, + Below, Below, None, None, + None, None, Post, Above, +--- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200 ++++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200 +@@ -1240,7 +1240,7 @@ + int script = item->script; + Q_ASSERT(script >= QFont::Devanagari && script <= QFont::Sinhala); + const unsigned short script_base = 0x0900 + 0x80*(script-QFont::Devanagari); +- const unsigned short ra = script_base + 0x30; ++ unsigned short ra = script_base + 0x30; //it was const unsigned short ra before modification + const unsigned short halant = script_base + 0x4d; + const unsigned short nukta = script_base + 0x3c; + +@@ -1278,6 +1278,11 @@ + } + #endif + ++ unsigned short *chkAssamese=reordered.data(); ++ if((script == QFont::Bengali) && (*chkAssamese==0x09F0)) //if it is assamese ra ++ { ++ ra = script_base + 0x70; ++ } + if (len != 1) { + unsigned short *uc = reordered.data(); + bool beginsWithRa = FALSE; +--- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200 ++++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200 +@@ -601,7 +601,7 @@ + None, None, None, None, + None, None, None, None, + +- None, None, None, None, ++ Below, None, None, None, + None, None, None, None, + None, None, None, None, + None, None, None, None, +--- qt-x11-free-3.3.2/tools/designer/uic/main.cpp.sopwith 2004-06-16 17:14:17.000000000 -0400 ++++ qt-x11-free-3.3.2/tools/designer/uic/main.cpp 2004-06-16 17:21:43.000000000 -0400 +@@ -149,6 +149,9 @@ + } else { + trmacro = &opt[1]; + } ++ } else if ( opt == "nostdlib") { ++ QStringList x; ++ QApplication::setLibraryPaths(x); + } else if ( opt == "L" ) { + if ( !(n < argc-1) ) { + error = "Missing plugin path."; +--- qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp.orig 2004-05-10 13:54:03.592289052 +0200 ++++ qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp 2004-05-10 13:56:10.165560473 +0200 +@@ -288,8 +288,9 @@ + { + #if defined(QT_CHECK_STATE) + if ( qApp->type() == QApplication::Tty ) { +- qWarning( "QPixmap: Cannot create a QPixmap when no GUI " +- "is being used" ); ++// qWarning( "QPixmap: Cannot create a QPixmap when no GUI " ++// "is being used" ); ++ ; + } + #endif + +--- qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp.orig 2004-11-09 18:57:15.012843629 +0100 ++++ qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp 2004-11-09 19:02:31.351637807 +0100 +@@ -1412,7 +1412,7 @@ + False, XA_ATOM, &type, &format, &nitems, &after, &data); + + if (type == XA_ATOM && format == 32) { +- ts.writeBlock((const char *) data, nitems * 4); ++ ts.writeBlock((const char *) data, nitems * sizeof(long)); + offset += nitems; + } else + after = 0; +--- qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp.fonts 2004-08-05 16:42:06.000000000 +0200 ++++ qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp 2004-09-28 16:11:54.955374161 +0200 +@@ -975,7 +981,7 @@ + }; + const XftDefaultFont defaults[] = { + { "Serif", "serif", FALSE }, +- { "Sans Serif", "sans-serif", FALSE }, ++ { "Sans", "sans-serif", FALSE }, + { "Monospace", "monospace", TRUE }, + { 0, 0, FALSE } + }; +--- ./src/widgets/qtextedit.cpp.resetinputcontext 2012-08-04 14:53:34.000000000 +0200 ++++ ./src/widgets/qtextedit.cpp 2012-09-29 11:36:19.410163805 +0200 +@@ -1904,9 +1904,6 @@ + + void QTextEdit::removeSelectedText( int selNum ) + { +- if(selNum != 0) +- resetInputContext(); +- + QTextCursor c1 = doc->selectionStartCursor( selNum ); + c1.restoreState(); + QTextCursor c2 = doc->selectionEndCursor( selNum ); +@@ -3169,7 +3166,6 @@ + return; + } + #endif +- resetInputContext(); + QTextParagraph *p = doc->paragAt( para ); + if ( !p ) + return; +@@ -3196,7 +3192,6 @@ + return; + } + #endif +- resetInputContext(); + for ( int i = 0; i < (int)doc->numSelections(); ++i ) + doc->removeSelection( i ); + +@@ -3238,7 +3233,6 @@ + if ( d->optimMode ) + return; + #endif +- resetInputContext(); + QTextParagraph *p = doc->paragAt( para ); + if ( !p ) + return; +@@ -3283,7 +3277,6 @@ + if ( isReadOnly() || !doc->commands()->isUndoAvailable() || !undoEnabled ) + return; + +- resetInputContext(); + for ( int i = 0; i < (int)doc->numSelections(); ++i ) + doc->removeSelection( i ); + +@@ -3334,7 +3327,6 @@ + if ( isReadOnly() || !doc->commands()->isRedoAvailable() || !undoEnabled ) + return; + +- resetInputContext(); + for ( int i = 0; i < (int)doc->numSelections(); ++i ) + doc->removeSelection( i ); + +@@ -3448,7 +3440,6 @@ + { + if ( isReadOnly() ) + return; +- resetInputContext(); + normalCopy(); + removeSelectedText(); + updateMicroFocusHint(); +@@ -3936,7 +3927,6 @@ + return; + } + #endif +- resetInputContext(); + if ( !isModified() && isReadOnly() && + this->context() == context && this->text() == text ) + return; +@@ -4110,7 +4100,6 @@ + if ( !p ) + return; + +- resetInputContext(); + if ( index > p->length() - 1 ) + index = p->length() - 1; + +@@ -4167,7 +4156,6 @@ + return; + } + #endif +- resetInputContext(); + if ( doc->hasSelection( selNum ) ) { + doc->removeSelection( selNum ); + repaintChanged(); +@@ -5074,7 +5062,6 @@ + } + if ( dc == doc ) + return; +- resetInputContext(); + doc = dc; + delete cursor; + cursor = new QTextCursor( doc ); +--- qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf.orig 2006-06-21 15:37:53.000000000 +0200 ++++ qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf 2006-06-21 15:38:02.000000000 +0200 +@@ -84,7 +84,7 @@ + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = +-QMAKE_STRIPFLAGS_LIB += --strip-unneeded ++QMAKE_STRIP = ++QMAKE_STRIPFLAGS_LIB += + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p +--- qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf.orig 2006-06-21 15:37:09.000000000 +0200 ++++ qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf 2006-06-21 15:37:19.000000000 +0200 +@@ -84,7 +84,7 @@ + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip +-QMAKE_STRIPFLAGS_LIB += --strip-unneeded ++QMAKE_STRIP = ++QMAKE_STRIPFLAGS_LIB += + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p +--- qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf.orig 2006-06-21 15:36:23.000000000 +0200 ++++ qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf 2006-06-21 15:36:56.000000000 +0200 +@@ -87,7 +87,7 @@ + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip +-QMAKE_STRIPFLAGS_LIB += --strip-unneeded ++QMAKE_STRIP = ++QMAKE_STRIPFLAGS_LIB += + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p +--- qt-x11-free-3.3.7/src/tools/qsettings.cpp.tn 2006-11-09 20:53:25.000000000 +0100 ++++ qt-x11-free-3.3.7/src/tools/qsettings.cpp 2006-11-09 20:59:53.000000000 +0100 +@@ -994,7 +994,10 @@ + #endif + + QFile file( filename + ".tmp" ); +- if (! file.open(IO_WriteOnly)) { ++ mode_t old_umask = umask(0022); ++ bool f = file.open(IO_WriteOnly); ++ umask(old_umask); ++ if (! f) { + + #ifdef QT_CHECK_STATE + qWarning("QSettings::sync: failed to open '%s' for writing", +--- qt-x11-free-3.3.8b/mkspecs/macx-mwerks/mwerkstmpl.xml.orig 2010-06-30 01:00:36.000000000 +0200 ++++ qt-x11-free-3.3.8b/mkspecs/macx-mwerks/mwerkstmpl.xml 2010-06-30 01:00:56.000000000 +0200 +@@ -817,7 +817,7 @@ + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> + </GROUP> +- <GROUP><Name>QtGenerated</NAME> ++ <GROUP><NAME>QtGenerated</NAME> + $$CODEWARRIOR_QPREPROCESS_GROUP + $$CODEWARRIOR_QPREPROCESSOUT_GROUP + </GROUP> +diff -up qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/main.cpp +--- qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig 2008-01-24 13:25:29.000000000 +0100 ++++ qt-x11-free-3.3.8b/tools/designer/uic/main.cpp 2008-01-24 13:28:17.000000000 +0100 +@@ -320,7 +320,7 @@ int main( int argc, char * argv[] ) + out << "/****************************************************************************" << endl; + out << "** Form "<< (impl? "implementation" : "interface") << " generated from reading ui file '" << fileName << "'" << endl; + out << "**" << endl; +- out << "** Created: " << QDateTime::currentDateTime().toString() << endl; ++ out << "** Created by User Interface Compiler" << endl; + out << "**" << endl; + out << "** WARNING! All changes made in this file will be lost!" << endl; + out << "****************************************************************************/" << endl << endl; +diff -up qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp +--- qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig 2008-01-24 13:28:30.000000000 +0100 ++++ qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp 2008-01-24 13:29:10.000000000 +0100 +@@ -137,7 +137,7 @@ void Uic::embed( QTextStream& out, const + for ( it = images.begin(); it != images.end(); ++it ) + out << "** " << *it << "\n"; + out << "**\n"; +- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; ++ out << "** Created by The User Interface Compiler" << "\n"; + out << "**\n"; + out << "** WARNING! All changes made in this file will be lost!\n"; + out << "****************************************************************************/\n"; +--- a/qmake/project.cpp.orig 2015-04-10 17:15:10.731091347 +0200 ++++ b/qmake/project.cpp 2013-12-30 17:58:15.471703644 +0100 +@@ -685,7 +685,7 @@ + // fprintf(stderr,"Current QT version number: " + ver + "\n"); + if (ver != "" && ver != test_version) { + ver = test_version; +- fprintf(stderr,"Changed QT version number to " + test_version + "!\n"); ++ fprintf(stderr,"Changed QT version number to %s!\n", test_version.ascii()); + } + } + } +--- qt3/src/tools/qgdict.cpp 2015-04-10 17:15:11.057092017 +0200 ++++ qt3/src/tools/qgdict.cpp 2013-12-30 17:58:15.516704273 +0100 +@@ -846,11 +846,11 @@ + QString line; + line.fill( '-', 60 ); + double real, ideal; +- qDebug( line.ascii() ); ++ qDebug( "%s", line.ascii() ); + qDebug( "DICTIONARY STATISTICS:" ); + if ( count() == 0 ) { + qDebug( "Empty!" ); +- qDebug( line.ascii() ); ++ qDebug( "%s", line.ascii() ); + return; + } + real = 0.0; +@@ -871,7 +871,7 @@ + while ( b-- ) + *pbuf++ = '*'; + *pbuf = '\0'; +- qDebug( buf ); ++ qDebug( "%s", buf ); + i++; + } + qDebug( "Array size = %d", size() ); +@@ -879,7 +879,7 @@ + qDebug( "Real dist = %g", real ); + qDebug( "Rand dist = %g", ideal ); + qDebug( "Real/Rand = %g", real/ideal ); +- qDebug( line.ascii() ); ++ qDebug( "%s", line.ascii() ); + #endif // QT_DEBUG + } + +--- a/src/tools/qgcache.cpp 2015-04-10 17:15:11.053092009 +0200 ++++ b/src/tools/qgcache.cpp 2013-12-30 17:58:15.515704259 +0100 +@@ -641,7 +641,7 @@ + #if defined(QT_DEBUG) + QString line; + line.fill( '*', 80 ); +- qDebug( line.ascii() ); ++ qDebug( "%s", line.ascii() ); + qDebug( "CACHE STATISTICS:" ); + qDebug( "cache contains %d item%s, with a total cost of %d", + count(), count() != 1 ? "s" : "", tCost ); +@@ -662,7 +662,7 @@ + lruList->dumps != 1 ? "have" : "has", lruList->dumpCosts ); + qDebug( "Statistics from internal dictionary class:" ); + dict->statistics(); +- qDebug( line.ascii() ); ++ qDebug( "%s", line.ascii() ); + #endif + } + diff --git a/redhat/dependencies/qt3/qt3-3.5.13.2.spec b/redhat/dependencies/qt3/qt3-3.5.13.2.spec index 981f78f2c..6b4e586e6 100644 --- a/redhat/dependencies/qt3/qt3-3.5.13.2.spec +++ b/redhat/dependencies/qt3/qt3-3.5.13.2.spec @@ -37,31 +37,8 @@ Source5: assistant3.desktop Source6: linguist3.desktop Source7: qtconfig3.desktop -Patch1: qt-3.3.4-print-CJK.patch -Patch2: qt-3.0.5-nodebug.patch -Patch3: qt-3.1.0-makefile.patch -Patch4: qt-x11-free-3.3.7-umask.patch -Patch5: qt-x11-free-3.3.6-strip.patch -Patch7: qt-x11-free-3.3.2-quiet.patch -Patch12: qt-uic-nostdlib.patch -Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch -Patch25: qt-x11-free-3.3.8b-uic-multilib.patch -Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch -Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch -Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch -Patch32: qt-3.3.6-fontrendering-214371.patch -Patch33: qt-3.3.8-fontrendering-214570.patch -Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch -Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch -Patch37: qt-3.3.6-fontrendering-gu-228452.patch -Patch39: qt-x11-free-3.3.7-arm.patch -Patch40: qt-x11-free-3.3.8b-typo.patch - -# immodule patches -Patch53: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch - -# upstream patches -Patch200: qt-x11-free-3.3.4-fullscreen.patch +# Monolithic patch for QT3 for TDE 3.5.13.2 +Patch1: qt3-3.5.13.2.patch %define qt_dirname qt-3.3 %define qtdir %{_libdir}/%{qt_dirname} @@ -374,36 +351,8 @@ for the Qt 3 toolkit. %prep %setup -q -n trinity-qt3-3.5.13.2%{?preversion:~%{preversion}} -%patch1 -p1 -b .cjk -%patch2 -p1 -b .ndebug -%patch3 -p1 -b .makefile -%patch4 -p1 -b .umask -%patch5 -p1 -%patch7 -p1 -b .quiet -%patch12 -p1 -b .nostdlib -%patch13 -p1 -b .fonts -%patch25 -p1 -b .uic-multilib -%patch27 -p1 -b .fontrendering-ml_IN-bz#209097 -%patch29 -p1 -b .fontrendering-as_IN-bz#209972 -%patch31 -p1 -b .fontrendering-te_IN-bz#211259 -%patch32 -p1 -b .fontrendering-bz#214371 -%patch33 -p1 -b .fontrendering-#214570 -%patch34 -p1 -b .fontrendering-#209974 -%patch35 -p1 -b .fontrendering-ml_IN-217657 -%patch37 -p1 -b .fontrendering-gu-228452 -# it's not 100% clear to me if this is safe for all archs -- Rex -%ifarch armv5tel -%patch39 -p1 -b .arm -%endif -%patch40 -p1 - -# immodule patches -%if %{immodule} -%patch53 -p1 -b .resetinputcontext -%endif +%patch1 -p1 -# upstream patches -%patch200 -p1 -b .fullscreen # convert to UTF-8 iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_ @@ -575,13 +524,13 @@ for a in */*/Makefile ; do mv -v ${a}.2 $a done -install -D -m 644 %{SOURCE2} %{buildroot}/etc/profile.d/qt3.sh -install -D -m 644 %{SOURCE3} %{buildroot}/etc/profile.d/qt3.csh +install -D -m 644 "%{SOURCE2}" %{buildroot}/etc/profile.d/qt3.sh +install -D -m 644 "%{SOURCE3}" %{buildroot}/etc/profile.d/qt3.csh # Add desktop files -mkdir -p %{buildroot}%{_datadir}/applications +mkdir -p "%{buildroot}%{_datadir}/applications" desktop-file-install \ - --dir %{buildroot}%{_datadir}/applications \ + --dir "%{buildroot}%{_datadir}/applications" \ --vendor="qt" \ %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} @@ -596,14 +545,13 @@ mkdir -p %{buildroot}/etc/ld.so.conf.d echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/qt-%{_arch}.conf # install icons -mkdir %{buildroot}%{_datadir}/pixmaps -install -m 644 tools/assistant/images/qt.png %{buildroot}%{_datadir}/pixmaps/qtconfig3.png -install -m 644 tools/assistant/images/designer.png %{buildroot}%{_datadir}/pixmaps/designer3.png -install -m 644 tools/assistant/images/assistant.png %{buildroot}%{_datadir}/pixmaps/assistant3.png -install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixmaps/linguist3.png +install -D -m 644 "tools/assistant/images/qt.png" "%{buildroot}%{_datadir}/pixmaps/qtconfig3.png" +install -D -m 644 "tools/assistant/images/designer.png" "%{buildroot}%{_datadir}/pixmaps/designer3.png" +install -D -m 644 "tools/assistant/images/assistant.png" "%{buildroot}%{_datadir}/pixmaps/assistant3.png" +install -D -m 644 "tools/assistant/images/linguist.png" "%{buildroot}%{_datadir}/pixmaps/linguist3.png" # own style directory -mkdir -p %{buildroot}%{qtdir}/plugins/styles +mkdir -p "%{buildroot}%{qtdir}/plugins/styles" %clean |