summaryrefslogtreecommitdiffstats
path: root/kde/patch/plasma-desktop
diff options
context:
space:
mode:
Diffstat (limited to 'kde/patch/plasma-desktop')
-rwxr-xr-xkde/patch/plasma-desktop/plasma-desktop-4.99.0_kfontinst_po.diff60
-rwxr-xr-xkde/patch/plasma-desktop/plasma-desktop-4.99.0_kfontinst_po.diff.gzbin625 -> 0 bytes
-rw-r--r--kde/patch/plasma-desktop/plasma-desktop_kdelibs4support.diff88
-rw-r--r--kde/patch/plasma-desktop/plasma-desktop_kdelibs4support.diff.gzbin1258 -> 0 bytes
4 files changed, 148 insertions, 0 deletions
diff --git a/kde/patch/plasma-desktop/plasma-desktop-4.99.0_kfontinst_po.diff b/kde/patch/plasma-desktop/plasma-desktop-4.99.0_kfontinst_po.diff
new file mode 100755
index 0000000..3b96d54
--- /dev/null
+++ b/kde/patch/plasma-desktop/plasma-desktop-4.99.0_kfontinst_po.diff
@@ -0,0 +1,60 @@
+diff -U 3 -H -d -p -r -N -x .svn -x .git -- a/po/bs/kfontinst.po b/po/bs/kfontinst.po
+--- a/po/bs/kfontinst.po 2014-05-09 17:23:01.000000000 +0200
++++ b/po/bs/kfontinst.po 2014-05-18 18:38:26.513853094 +0200
+@@ -1169,7 +1169,7 @@ msgstr "abcčćdđefghijklmnoprsštuvzž
+ #: lib/FcEngine.cpp:1004
+ msgctxt "Numbers and characters"
+ msgid "0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]"
+-msgstr "0123456789.:,;(*!?'/\\\")£$€%^&amp;-+@
++msgstr "0123456789.:,;(*!?'/\\\")£$€%^&amp;-+@~#<>{}[]"
+
+ #: lib/FcEngine.cpp:1401
+ msgid "ERROR: Could not determine font's name."
+diff -U 3 -H -d -p -r -N -x .svn -x .git -- a/po/sr/kfontinst.po b/po/sr/kfontinst.po
+--- a/po/sr/kfontinst.po 2014-05-09 17:27:16.000000000 +0200
++++ b/po/sr/kfontinst.po 2014-05-18 18:38:40.837414520 +0200
+@@ -1221,7 +1221,7 @@ msgstr "абвгдђежзијклљмн
+ #: lib/FcEngine.cpp:1004
+ msgctxt "Numbers and characters"
+ msgid "0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]"
+-msgstr "0123456789.:,;(*!?'/\\\")£$€%^&amp;-+@
++msgstr "0123456789.:,;(*!?'/\\\")£$€%^&amp;-+@~#<>{}[]"
+
+ #: lib/FcEngine.cpp:1401
+ msgid "ERROR: Could not determine font's name."
+diff -U 3 -H -d -p -r -N -x .svn -x .git -- a/po/sr@ijekavian/kfontinst.po b/po/sr@ijekavian/kfontinst.po
+--- a/po/sr@ijekavian/kfontinst.po 2014-05-09 17:27:20.000000000 +0200
++++ b/po/sr@ijekavian/kfontinst.po 2014-05-18 18:38:54.049932456 +0200
+@@ -1221,7 +1221,7 @@ msgstr "абвгдђежзијклљмн
+ #: lib/FcEngine.cpp:1004
+ msgctxt "Numbers and characters"
+ msgid "0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]"
+-msgstr "0123456789.:,;(*!?'/\\\")£$€%^&amp;-+@
++msgstr "0123456789.:,;(*!?'/\\\")£$€%^&amp;-+@~#<>{}[]"
+
+ #: lib/FcEngine.cpp:1401
+ msgid "ERROR: Could not determine font's name."
+diff -U 3 -H -d -p -r -N -x .svn -x .git -- a/po/sr@ijekavianlatin/kfontinst.po b/po/sr@ijekavianlatin/kfontinst.po
+--- a/po/sr@ijekavianlatin/kfontinst.po 2014-05-09 17:27:24.000000000 +0200
++++ b/po/sr@ijekavianlatin/kfontinst.po 2014-05-18 18:39:09.884553255 +0200
+@@ -1224,7 +1224,7 @@ msgstr "abcčćdđefghijklmnoprsštuvzž
+ #: lib/FcEngine.cpp:1004
+ msgctxt "Numbers and characters"
+ msgid "0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]"
+-msgstr "0123456789.:,;(*!?'/\\\")£$€%^&amp;-+@
++msgstr "0123456789.:,;(*!?'/\\\")£$€%^&amp;-+@~#<>{}[]"
+
+ #: lib/FcEngine.cpp:1401
+ msgid "ERROR: Could not determine font's name."
+diff -U 3 -H -d -p -r -N -x .svn -x .git -- a/po/sr@latin/kfontinst.po b/po/sr@latin/kfontinst.po
+--- a/po/sr@latin/kfontinst.po 2014-05-09 17:27:27.000000000 +0200
++++ b/po/sr@latin/kfontinst.po 2014-05-18 18:39:21.351002849 +0200
+@@ -1223,7 +1223,7 @@ msgstr "abcčćdđefghijklmnoprsštuvzž
+ #: lib/FcEngine.cpp:1004
+ msgctxt "Numbers and characters"
+ msgid "0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]"
+-msgstr "0123456789.:,;(*!?'/\\\")£$€%^&amp;-+@
++msgstr "0123456789.:,;(*!?'/\\\")£$€%^&amp;-+@~#<>{}[]"
+
+ #: lib/FcEngine.cpp:1401
+ msgid "ERROR: Could not determine font's name." \ No newline at end of file
diff --git a/kde/patch/plasma-desktop/plasma-desktop-4.99.0_kfontinst_po.diff.gz b/kde/patch/plasma-desktop/plasma-desktop-4.99.0_kfontinst_po.diff.gz
deleted file mode 100755
index c93e8a6..0000000
--- a/kde/patch/plasma-desktop/plasma-desktop-4.99.0_kfontinst_po.diff.gz
+++ /dev/null
Binary files differ
diff --git a/kde/patch/plasma-desktop/plasma-desktop_kdelibs4support.diff b/kde/patch/plasma-desktop/plasma-desktop_kdelibs4support.diff
new file mode 100644
index 0000000..74d541c
--- /dev/null
+++ b/kde/patch/plasma-desktop/plasma-desktop_kdelibs4support.diff
@@ -0,0 +1,88 @@
+--- 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 )
diff --git a/kde/patch/plasma-desktop/plasma-desktop_kdelibs4support.diff.gz b/kde/patch/plasma-desktop/plasma-desktop_kdelibs4support.diff.gz
deleted file mode 100644
index 0b27171..0000000
--- a/kde/patch/plasma-desktop/plasma-desktop_kdelibs4support.diff.gz
+++ /dev/null
Binary files differ
generated by cgit v1.2.3 (git 2.26.2) at 2024-04-19 00:24:18 +0000