[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-release-team
Subject: Re: KF5 beta3
From: Eric Hameleers <alien () slackware ! com>
Date: 2014-06-03 19:49:01
Message-ID: alpine.LNX.2.02.1406031237390.11546 () connie ! slackware ! com
[Download RAW message or body]
On Sun, 1 Jun 2014, David Faure wrote:
> As planned, here's KF5 beta3, aka 4.100.0.
>
> * New this month:
> - kfileaudiopreview doesn't exist anymore
> - the attached tags.git file indicates the tag to use for distros using git
> instead of tarballs [note the exception on the last line...]
>
> * Public release date: June 4 (unless someone shouts otherwise)
I built the KF5 Beta 3 without issues. Then I built a Plasma Next
package set on top of that, using git HEAD checkouts (of the
frameworks branch where applicable) and have a much better-looking
desktop experience (although crash-prone) than when I tested the
plasma 4.96.0 tarballs. Good progress!
One thing which I did not find, is the repository from which
libkscreen2-1-71.tar.xz source tarball was created, so I re-used the
tarball I found in the plasma-4.96.0 directory on ftp.kde.org.
I did however have to write a couple of patches to get everything
compiling. Well, except kdepimlibs (frameworks branch) which I can not
get to compile no matter what I try.
The four patches I created are attached for those who may want them.
Cheers, Eric
--
Eric Hameleers <alien@slackware.com>
Jabber: alien@jabber.xs4all.nl
["plasma-desktop_kdelibs4support.diff" (TEXT/PLAIN)]
--- plasma-desktop-20140602git/kcms/kfontinst/lib/CMakeLists.txt.orig 2014-06-03 \
16:08:19.294297273 +0200
+++ plasma-desktop-20140602git/kcms/kfontinst/lib/CMakeLists.txt 2014-06-03 \
16:09:12.420293700 +0200 @@ -15,6 +15,6 @@
set_target_properties(kfontinst PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION \
5 )
add_library(kfontinstui SHARED ${kfontinstui_LIB_SRCS})
-target_link_libraries(kfontinstui Qt5::X11Extras KF5::KIOCore KF5::KIOWidgets \
${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} ${X11_X11_LIB} ${X11_Xft_LIB} kfontinst \
) +target_link_libraries(kfontinstui Qt5::X11Extras KF5::KIOCore KF5::KIOWidgets \
KF5::KDELibs4Support XCB::XCB XCB::IMAGE ${FREETYPE_LIBRARIES} \
${FONTCONFIG_LIBRARIES} ${X11_X11_LIB} ${X11_Xft_LIB} kfontinst ) \
set_target_properties(kfontinstui PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION \
5 ) install(TARGETS kfontinst kfontinstui ${INSTALL_TARGETS_DEFAULT_ARGS} )
--- plasma-desktop-20140602git/kcms/kfontinst/dbus/CMakeLists.txt.orig 2014-06-02 \
13:47:27.000000000 +0200
+++ plasma-desktop-20140602git/kcms/kfontinst/dbus/CMakeLists.txt 2014-06-03 \
17:17:01.382378586 +0200 @@ -14,11 +14,11 @@
set_target_properties(fontinst_bin PROPERTIES OUTPUT_NAME fontinst)
target_link_libraries(fontinst_bin
- Qt5::DBus Qt5::Xml ${FONTCONFIG_LIBRARIES} kfontinst)
+ Qt5::DBus Qt5::Xml Qt5::X11Extras KF5::KDELibs4Support \
XCB::XCB XCB::IMAGE ${FONTCONFIG_LIBRARIES} kfontinst)
set_target_properties(fontinst_helper PROPERTIES OUTPUT_NAME fontinst_helper)
target_link_libraries(fontinst_helper
- Qt5::DBus Qt5::Xml ${FONTCONFIG_LIBRARIES} kfontinst)
+ Qt5::DBus Qt5::Xml Qt5::X11Extras KF5::KDELibs4Support \
XCB::XCB XCB::IMAGE ${FONTCONFIG_LIBRARIES} kfontinst)
install(TARGETS fontinst_bin DESTINATION ${LIBEXEC_INSTALL_DIR} )
install(TARGETS fontinst_helper DESTINATION ${LIBEXEC_INSTALL_DIR} )
--- plasma-desktop-20140602git/kcms/kfontinst/kcmfontinst/CMakeLists.txt.orig 2014-06-02 \
13:47:27.000000000 +0200
+++ plasma-desktop-20140602git/kcms/kfontinst/kcmfontinst/CMakeLists.txt 2014-06-03 \
19:19:00.376164975 +0200 @@ -10,6 +10,7 @@
add_library(kcm_fontinst MODULE ${kcm_fontinst_PART_SRCS})
target_link_libraries(kcm_fontinst
+ Qt5::X11Extras
KF5::Archive
KF5::KCMUtils
KF5::Su
--- plasma-desktop-20140602git/kcms/kfontinst/apps/CMakeLists.txt.orig 2014-06-02 \
13:47:27.000000000 +0200
+++ plasma-desktop-20140602git/kcms/kfontinst/apps/CMakeLists.txt 2014-06-03 \
19:27:47.209175028 +0200 @@ -31,6 +31,7 @@
)
target_link_libraries(kfontprint_bin
Qt5::PrintSupport
+ Qt5::X11Extras
KF5::IconThemes
KF5::KDELibs4Support
${X11_X11_LIB}
@@ -38,7 +39,7 @@
kfontinstui
kfontinst
)
-target_link_libraries(kfontview_bin KF5::Parts KF5::XmlGui kfontinstui kfontinst )
+target_link_libraries(kfontview_bin KF5::Parts KF5::XmlGui KF5::KDELibs4Support \
kfontinstui kfontinst )
install(TARGETS kfontinst_bin ${INSTALL_TARGETS_DEFAULT_ARGS} )
install(TARGETS kfontprint_bin DESTINATION ${LIBEXEC_INSTALL_DIR} )
--- plasma-desktop-20140602git/kcms/kfontinst/kio/CMakeLists.txt.orig 2014-06-02 \
13:47:27.000000000 +0200
+++ plasma-desktop-20140602git/kcms/kfontinst/kio/CMakeLists.txt 2014-06-03 \
19:31:34.379189708 +0200 @@ -5,7 +5,7 @@
set(kio_fonts_PART_SRCS FontInstInterface.cpp KioFonts.cpp \
${libkfontinstdbusiface_SRCS}) # qt5_add_dbus_interface(kio_fonts_PART_SRCS \
../dbus/org.kde.fontinst.xml FontinstIface) add_library(kio_fonts MODULE \
${kio_fonts_PART_SRCS} ${KFI_FONTINST_AUTH_SRC} )
-target_link_libraries(kio_fonts Qt5::DBus Qt5::X11Extras Qt5::Xml KF5::Archive \
KF5::KIOCore KF5::KIOWidgets kfontinst ) +target_link_libraries(kio_fonts Qt5::DBus \
Qt5::X11Extras Qt5::Xml KF5::Archive KF5::KIOCore KF5::KIOWidgets \
KF5::KDELibs4Support kfontinst ) install(TARGETS kio_fonts DESTINATION \
${PLUGIN_INSTALL_DIR} ) install( FILES fonts.desktop DESTINATION \
${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/services ) install( FILES \
fonts.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
--- plasma-desktop-20140602git/kcms/kfontinst/thumbnail/CMakeLists.txt.orig 2014-06-02 \
13:47:27.000000000 +0200
+++ plasma-desktop-20140602git/kcms/kfontinst/thumbnail/CMakeLists.txt 2014-06-03 \
19:34:23.357198688 +0200 @@ -7,7 +7,7 @@
add_library(fontthumbnail MODULE ${fontthumbnail_PART_SRCS})
-target_link_libraries(fontthumbnail KF5::Archive KF5::KIOCore KF5::KIOWidgets \
kfontinstui kfontinst ) +target_link_libraries(fontthumbnail KF5::Archive \
KF5::KIOCore KF5::KIOWidgets KF5::KDELibs4Support kfontinstui kfontinst )
install(TARGETS fontthumbnail DESTINATION ${PLUGIN_INSTALL_DIR} )
install( FILES fontthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
--- plasma-desktop-20140602git/kcms/kfontinst/viewpart/CMakeLists.txt.orig 2014-06-02 \
13:47:27.000000000 +0200
+++ plasma-desktop-20140602git/kcms/kfontinst/viewpart/CMakeLists.txt 2014-06-03 \
19:42:35.590219674 +0200 @@ -8,7 +8,7 @@
add_library(kfontviewpart MODULE ${kfontviewpart_PART_SRCS})
-target_link_libraries(kfontviewpart KF5::Archive KF5::Parts KF5::XmlGui \
${FONTCONFIG_LIBRARIES} kfontinstui kfontinst ) +target_link_libraries(kfontviewpart \
KF5::Archive KF5::Parts KF5::XmlGui KF5::KDELibs4Support ${FONTCONFIG_LIBRARIES} \
kfontinstui kfontinst )
install(TARGETS kfontviewpart DESTINATION ${PLUGIN_INSTALL_DIR} )
install( FILES kfontviewpart.rc DESTINATION ${DATA_INSTALL_DIR}/kfontinst )
["kde-cli-tools_kaboutdata.diff" (TEXT/PLAIN)]
diff -uar kde-cli-tools-20140602git.orig/kdesu/kdesu.cpp \
kde-cli-tools-20140602git/kdesu/kdesu.cpp
--- kde-cli-tools-20140602git.orig/kdesu/kdesu.cpp 2014-06-02 13:45:49.000000000 \
+0200
+++ kde-cli-tools-20140602git/kdesu/kdesu.cpp 2014-06-03 00:41:16.998697492 +0200
@@ -81,9 +81,9 @@
if (duser.isEmpty())
duser = "root";
- KAboutData aboutData("kdesu", 0, i18n("KDE su"),
+ KAboutData aboutData("kdesu", i18n("KDE su"),
Version, i18n("Runs a program with elevated privileges."),
- KAboutData::License_Artistic,
+ KAboutLicense::Artistic,
i18n("Copyright (c) 1998-2000 Geert Jansen, Pietro Iglio"));
aboutData.addAuthor(i18n("Geert Jansen"), i18n("Maintainer"),
"jansen@kde.org", "http://www.stack.nl/~geertj/");
diff -uar kde-cli-tools-20140602git.orig/kioclient/kioclient.cpp \
kde-cli-tools-20140602git/kioclient/kioclient.cpp
--- kde-cli-tools-20140602git.orig/kioclient/kioclient.cpp 2014-06-02 \
13:45:49.000000000 +0200
+++ kde-cli-tools-20140602git/kioclient/kioclient.cpp 2014-06-03 00:41:50.446696159 \
+0200 @@ -133,7 +133,7 @@
QString programName = i18n("KIO Client");
QString description = i18n("Command-line tool for network-transparent \
operations"); QString version = "2.0";
- KAboutData data(appName, appName, programName, version, description, \
KAboutData::License_LGPL_V2); + KAboutData data(appName, programName, version, \
description, KAboutLicense::LGPL_V2);
QCommandLineParser parser;
parser.addOption(QCommandLineOption("noninteractive", i18n("Non-interactive use: \
no message boxes. If you don't want a"
diff -uar kde-cli-tools-20140602git.orig/kreadconfig/kreadconfig.cpp \
kde-cli-tools-20140602git/kreadconfig/kreadconfig.cpp
--- kde-cli-tools-20140602git.orig/kreadconfig/kreadconfig.cpp 2014-06-02 \
13:45:49.000000000 +0200
+++ kde-cli-tools-20140602git/kreadconfig/kreadconfig.cpp 2014-06-03 \
00:40:33.820702023 +0200 @@ -53,10 +53,10 @@
int main(int argc, char **argv)
{
QCoreApplication app(argc, argv);
- KAboutData aboutData("kreadconfig", 0, i18n("KReadConfig"),
+ KAboutData aboutData("kreadconfig", i18n("KReadConfig"),
"1.0.1",
i18n("Read KConfig entries - for use in shell scripts"),
- KAboutData::License_GPL,
+ KAboutLicense::GPL,
i18n("(c) 2001 Red Hat, Inc."));
aboutData.addAuthor(i18n("Bernhard Rosenkraenzer"), QString(), "bero@redhat.com");
diff -uar kde-cli-tools-20140602git.orig/kreadconfig/kwriteconfig.cpp \
kde-cli-tools-20140602git/kreadconfig/kwriteconfig.cpp
--- kde-cli-tools-20140602git.orig/kreadconfig/kwriteconfig.cpp 2014-06-02 \
13:45:49.000000000 +0200
+++ kde-cli-tools-20140602git/kreadconfig/kwriteconfig.cpp 2014-06-03 \
00:39:54.811701204 +0200 @@ -31,10 +31,10 @@
int main(int argc, char **argv)
{
QCoreApplication app(argc, argv);
- KAboutData aboutData("kwriteconfig", 0, i18n("KWriteConfig"),
+ KAboutData aboutData("kwriteconfig", i18n("KWriteConfig"),
"1.0.0",
i18n("Write KConfig entries - for use in shell scripts"),
- KAboutData::License_GPL,
+ KAboutLicense::GPL,
i18n("(c) 2001 Red Hat, Inc. & Luís Pedro Coelho"));
aboutData.addAuthor("Luís Pedro Coelho", QString(), "luis_pedro@netcabo.pt");
aboutData.addAuthor("Bernhard Rosenkraenzer", i18n("Wrote kreadconfig on which this \
is based"), "bero@redhat.com");
["kde-cli-tools_ecm.patch" (TEXT/PLAIN)]
--- kde-cli-tools-20140602git/CMakeLists.txt.orig 2014-06-02 13:45:49.000000000 +0200
+++ kde-cli-tools-20140602git/CMakeLists.txt 2014-06-02 23:45:22.337682384 +0200
@@ -21,7 +21,7 @@
Test
)
-find_package(KF5 CONFIG REQUIRED COMPONENTS
+find_package(KF5 REQUIRED COMPONENTS
Config
Init
KCMUtils
["baloo-4.96.0_kaboutdata.diff" (TEXT/PLAIN)]
From: Andreas Hartmetz <ahartmetz@gmail.com>
Date: Wed, 14 May 2014 02:36:57 +0000
Subject: Adapt to changes in KAboutData.
X-Git-Url: http://quickgit.kde.org/?p=baloo.git&a=commitdiff&h=46e3ea7828c8066e75bec87ba0a19d5ef3bd700a
---
Adapt to changes in KAboutData.
---
--- a/src/file/kcm/kcm.cpp
+++ b/src/file/kcm/kcm.cpp
@@ -58,8 +58,8 @@
: KCModule(parent, args)
{
KAboutData* about = new KAboutData(
- "kcm_baloofile", "kcm_baloofile", i18n("Configure Desktop Search"),
- "0.1", QString(), KAboutData::License_GPL,
+ "kcm_baloofile", i18n("Configure Desktop Search"),
+ "0.1", QString(), KAboutLicense::GPL,
i18n("Copyright 2007-2010 Sebastian Trüg"));
about->addAuthor(i18n("Sebastian Trüg"), QString(), "trueg@kde.org");
about->addAuthor(i18n("Vishesh Handa"), QString(), "vhanda@kde.org");
--- a/src/file/main.cpp
+++ b/src/file/main.cpp
@@ -44,9 +44,9 @@
lowerSchedulingPriority();
lowerPriority();
- KAboutData aboutData("baloo_file", "baloo_file", i18n("Baloo File"), "0.1",
+ KAboutData aboutData("baloo_file", i18n("Baloo File"), "0.1",
i18n("An application to handle file metadata"),
- KAboutData::License_LGPL_V2);
+ KAboutLicense::LGPL_V2);
aboutData.addAuthor(i18n("Vishesh Handa"), i18n("Maintainer"), "me@vhanda.in", "http://vhanda.in");
KAboutData::setApplicationData(aboutData);
--- a/src/tools/baloosearch/main.cpp
+++ b/src/tools/baloosearch/main.cpp
@@ -55,11 +55,10 @@
int main(int argc, char* argv[])
{
KAboutData aboutData("baloosearch",
- "baloosearch",
i18n("Baloo Search"),
"0.1",
i18n("Baloo Search - A debugging tool"),
- KAboutData::License_GPL,
+ KAboutLicense::GPL,
i18n("(c) 2013, Vishesh Handa"));
aboutData.addAuthor(i18n("Vishesh Handa"), i18n("Maintainer"), "me@vhanda.in");
--- a/src/tools/balooshow/main.cpp
+++ b/src/tools/balooshow/main.cpp
@@ -46,11 +46,10 @@
int main(int argc, char* argv[])
{
KAboutData aboutData("balooshow",
- "balooshow",
i18n("Baloo Show"),
"0.1",
i18n("The Baloo data Viewer - A debugging tool"),
- KAboutData::License_GPL,
+ KAboutLicense::GPL,
i18n("(c) 2012, Vishesh Handa"));
aboutData.addAuthor(i18n("Vishesh Handa"), i18n("Maintainer"), "me@vhanda.in");
_______________________________________________
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic