diff --git a/.cvsignore b/.cvsignore index eecab33..98d907c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ kdesdk-4.1.2.tar.bz2 +kdesdk-4.1.80.tar.bz2 diff --git a/kdesdk-4.1.1-quit.patch b/kdesdk-4.1.1-quit.patch deleted file mode 100644 index 7c47658..0000000 --- a/kdesdk-4.1.1-quit.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up kdesdk-4.1.1/lokalize/src/kaider.cpp.orig kdesdk-4.1.1/lokalize/src/kaider.cpp ---- kdesdk-4.1.1/lokalize/src/kaider.cpp.orig 2008-09-24 12:23:07.000000000 +0200 -+++ kdesdk-4.1.1/lokalize/src/kaider.cpp 2008-09-24 12:18:31.000000000 +0200 -@@ -221,11 +221,11 @@ void KAider::setupActions() - connect (_catalog,SIGNAL(cleanChanged(bool)),action,SLOT(setDisabled(bool))); - connect (_catalog,SIGNAL(cleanChanged(bool)),this,SLOT(setModificationSign(bool))); - action = KStandardAction::saveAs(this, SLOT(fileSaveAs()), ac); -- //action = KStandardAction::quit(qApp, SLOT(quit()), ac); -- //action->setText(i18nc("@action:inmenu","Close all Lokalize windows")); -+ action = KStandardAction::quit(qApp, SLOT(quit()), ac); -+ action->setText(i18nc("@action:inmenu","Close all Lokalize windows")); - -- //KStandardAction::quit(kapp, SLOT(quit()), ac); -- //KStandardAction::quit(this, SLOT(deleteLater()), ac); -+ KStandardAction::quit(kapp, SLOT(quit()), ac); -+ KStandardAction::quit(this, SLOT(deleteLater()), ac); - - - //Settings diff --git a/kdesdk-4.1.2-kdecore.patch b/kdesdk-4.1.2-kdecore.patch deleted file mode 100644 index 63de776..0000000 --- a/kdesdk-4.1.2-kdecore.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -up kdesdk-4.1.2/poxml/CMakeLists.txt.libs kdesdk-4.1.2/poxml/CMakeLists.txt ---- kdesdk-4.1.2/poxml/CMakeLists.txt.libs 2008-08-28 03:07:26.000000000 -0500 -+++ kdesdk-4.1.2/poxml/CMakeLists.txt 2008-10-22 09:39:06.000000000 -0500 -@@ -11,7 +11,7 @@ set(split2po_SRCS split.cpp parser.cpp) - - kde4_add_executable(split2po ${split2po_SRCS}) - --target_link_libraries(split2po ${QT_QTXML_LIBRARY} ${KDE4_KDECORE_LIBS}) -+target_link_libraries(split2po ${QT_QTXML_LIBRARY}) - - install(TARGETS split2po ${INSTALL_TARGETS_DEFAULT_ARGS}) - -@@ -23,7 +23,7 @@ set(xml2pot_SRCS xml2pot.cpp parser.cpp) - - kde4_add_executable(xml2pot ${xml2pot_SRCS}) - --target_link_libraries(xml2pot ${QT_QTXML_LIBRARY} ${KDE4_KDECORE_LIBS}) -+target_link_libraries(xml2pot ${QT_QTXML_LIBRARY} ) - - install(TARGETS xml2pot ${INSTALL_TARGETS_DEFAULT_ARGS}) - -@@ -42,7 +42,7 @@ set(po2xml_SRCS - kde4_add_executable(po2xml ${po2xml_SRCS}) - add_dependencies(po2xml antlr) - --target_link_libraries(po2xml antlr ${KDE4_KDECORE_LIBS} ${QT_QTXML_LIBRARY}) -+target_link_libraries(po2xml antlr ${QT_QTXML_LIBRARY}) - - install(TARGETS po2xml ${INSTALL_TARGETS_DEFAULT_ARGS}) - -@@ -59,7 +59,7 @@ set(swappo_SRCS - kde4_add_executable(swappo ${swappo_SRCS}) - add_dependencies(swappo antlr) - --target_link_libraries(swappo antlr ${KDE4_KDECORE_LIBS} ${QT_QTXML_LIBRARY}) -+target_link_libraries(swappo antlr ${QT_QTXML_LIBRARY}) - - install(TARGETS swappo ${INSTALL_TARGETS_DEFAULT_ARGS}) - diff --git a/kdesdk-4.1.2-quit.patch b/kdesdk-4.1.2-quit.patch new file mode 100644 index 0000000..2bc59d4 --- /dev/null +++ b/kdesdk-4.1.2-quit.patch @@ -0,0 +1,35 @@ +diff -up kdesdk-4.1.2/lokalize/src/kaider.cpp.quit kdesdk-4.1.2/lokalize/src/kaider.cpp +--- kdesdk-4.1.2/lokalize/src/kaider.cpp.quit 2008-08-28 10:07:29.000000000 +0200 ++++ kdesdk-4.1.2/lokalize/src/kaider.cpp 2008-10-22 23:13:27.000000000 +0200 +@@ -225,7 +225,7 @@ void KAider::setupActions() + //action->setText(i18nc("@action:inmenu","Close all Lokalize windows")); + + //KStandardAction::quit(kapp, SLOT(quit()), ac); +- //KStandardAction::quit(this, SLOT(deleteLater()), ac); ++ KStandardAction::quit(this, SLOT(slotFileQuit()), ac); + + + //Settings +@@ -820,6 +820,11 @@ bool KAider::queryClose() + } + } + ++void KAider::slotFileQuit() ++{ ++ if (queryClose()) ++ qApp->quit(); ++} + + void KAider::undo() + { +diff -up kdesdk-4.1.2/lokalize/src/kaider.h.quit kdesdk-4.1.2/lokalize/src/kaider.h +--- kdesdk-4.1.2/lokalize/src/kaider.h.quit 2008-10-22 22:50:18.000000000 +0200 ++++ kdesdk-4.1.2/lokalize/src/kaider.h 2008-10-22 22:51:48.000000000 +0200 +@@ -115,6 +115,7 @@ private slots: + bool fileSave(const KUrl& url = KUrl()); + bool fileSaveAs(); + ++ void slotFileQuit(); + + void undo(); + void redo(); diff --git a/kdesdk.spec b/kdesdk.spec index bbf6692..c6c9e98 100644 --- a/kdesdk.spec +++ b/kdesdk.spec @@ -1,7 +1,6 @@ - Name: kdesdk -Version: 4.1.2 -Release: 3%{?dist} +Version: 4.1.80 +Release: 2%{?dist} Summary: The KDE Software Development Kit (SDK) Group: User Interface/Desktops @@ -9,20 +8,12 @@ Group: User Interface/Desktops License: GPLv2 URL: http://www.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2 +Patch0: kdesdk-4.1.2-quit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -## upstream patches -Patch100: kdesdk-4.1.1-quit.patch -# http://bugzilla.redhat.com/467984 -Patch101: kdesdk-4.1.2-kdecore.patch - -BuildRequires: kde-filesystem >= 4 -%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } -BuildRequires: kdelibs4-devel >= %{version} BuildRequires: kdepimlibs-devel >= %{version} BuildRequires: kdebase-workspace-devel >= %{version} BuildRequires: strigi-devel -BuildRequires: cmake BuildRequires: flex BuildRequires: giflib-devel BuildRequires: apr-devel @@ -41,7 +32,6 @@ BuildRequires: binutils-devel Requires(post): xdg-utils Requires(postun): xdg-utils -Requires: kdelibs4 >= %{version} Requires: kdepimlibs >= %{version} Requires: kdebase-workspace >= %{version} Requires: %{name}-libs = %{version}-%{release} @@ -73,7 +63,7 @@ Group: System Environment/Libraries Summary: Developer files for %{name} Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} -Requires: kdelibs4-devel kdepimlibs-devel +Requires: kdepimlibs-devel %description devel Files for developing applications using %{name}. @@ -90,10 +80,8 @@ xml2pot %prep %setup -q +%patch0 -p1 -b .quit -# upstream patches -%patch100 -p1 -b .quit -%patch101 -p1 -b .kdecore %build mkdir -p %{_target_platform} @@ -107,7 +95,7 @@ make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 %install rm -rf %{buildroot} -make install DESTDIR=%{buildroot} -C %{_target_platform} +make install/fast DESTDIR=%{buildroot} -C %{_target_platform} # unpackaged files rm -f %{buildroot}%{_kde4_libdir}/libantlr.so @@ -164,9 +152,11 @@ rm -rf %{buildroot} %{_kde4_appsdir}/kbugbuster/ %{_kde4_appsdir}/kcachegrind/* %{_kde4_appsdir}/kconf_update/* +%{_kde4_appsdir}/kio_perldoc/ %{_kde4_appsdir}/kdevappwizard/ %{_kde4_appsdir}/kmtrace/ %{_kde4_appsdir}/kompare/ +%{_kde4_appsdir}/kpartloader/ %{_kde4_appsdir}/kuiviewer/* %{_kde4_appsdir}/kuiviewerpart/* %{_kde4_appsdir}/lokalize/ @@ -223,6 +213,23 @@ rm -rf %{buildroot} %changelog +* Thu Nov 20 2008 Than Ngo 4.1.80-2 +- merged + +* Thu Nov 20 Lorenzo Villani - 4.1.80-1 +- 4.1.80 +- BR cmake >= 2.6.2 +- make install/fast +- rebase lokalize quit menu patch +- kdesdk-4.1.2-kdecore.patch upstreamed, dropped + +* Wed Nov 12 2008 Than Ngo 4.1.3-1 +- 4.1.3 + +* Wed Oct 22 2008 Than Ngo 4.1.2-4 +- check if the document has been saved, if not ask the user + to save the change or close without saving + * Wed Oct 22 2008 Rex Dieter 4.1.2-3 - -utils should not depend on kdelibs etc (#467984) diff --git a/sources b/sources index d1c3727..7cf623f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -29b29ed131db84a9abb2b4bf4d81c56e kdesdk-4.1.2.tar.bz2 +9d2bdeb07fb54287b1cc47ec0a7ecf69 kdesdk-4.1.80.tar.bz2