updates to latest version

This commit is contained in:
Fabian Kosmale 2014-06-21 23:31:24 +00:00
parent cd6c007464
commit c7b6896194
6 changed files with 6 additions and 82 deletions

View File

@ -14,7 +14,7 @@ makedepends=('extra-cmake-modules')
checkdepends=('cmake')
groups=('kf5')
source=("${KFServer}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
md5sums=('5e0ee34a2fabd0ac955c0179cc25f037')
sha256sums=( $(getSum ${pkgname}) )
prepare() {
mkdir -p build

View File

@ -16,7 +16,7 @@ groups=('kf5')
install=kio.install
options=("debug")
source=("${KFServer}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
md5sums=('53bc1e6425b5bde56aa89b2b2ced9ba3')
sha256sums=( $(getSum ${pkgname}) )
prepare() {
mkdir -p build

View File

@ -14,7 +14,7 @@ makedepends=('extra-cmake-modules')
groups=('kf5')
options=('debug')
source=("${KFServer}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
md5sums=('9bf086a6ae58fd67f378cc3d108ae051')
sha256sums=( $(getSum ${pkgname}) )
prepare() {
mkdir -p build

View File

@ -14,7 +14,7 @@ makedepends=('extra-cmake-modules')
groups=('kf5')
options=("debug")
source=("${KFServer}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
md5sums=('33c9427af1bb6861fa5a7487c6623496')
sha256sums=( $(getSum ${pkgname}) )
prepare() {
mkdir -p build

View File

@ -1,76 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4db9ac5..251236d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,15 @@ set_package_properties(KF5Attica PROPERTIES DESCRIPTION "A Qt library that imple
URL "https://projects.kde.org/attica"
TYPE OPTIONAL
)
+
+# Extra libraries
set (HAVE_ATTICA ${KF5Attica_FOUND})
+if (HAVE_ATTICA)
+ set(XMLGUI_EXTRA_LIBS ${XMLGUI_EXTRA_LIBS} KF5::Attica)
+endif()
+if (WIN32)
+ set(XMLGUI_EXTRA_LIBS ${XMLGUI_EXTRA_LIBS} Segur32) # GetUserNameEx()
+endif()
# Subdirectories
add_subdirectory(src)
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 01725da..13b57fa 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -12,7 +12,7 @@ macro(XMLGUI_TESTS)
add_executable(${_testname} ${_testname}.cpp)
add_test(kxmlgui-${_testname} ${_testname})
ecm_mark_as_test(${_testname})
- target_link_libraries(${_testname} Qt5::Test KF5::I18n KF5::IconThemes KF5::XmlGui)
+ target_link_libraries(${_testname} Qt5::Test KF5::I18n KF5::IconThemes KF5::XmlGui ${XMLGUI_EXTRA_LIBS})
endforeach(_testname)
endmacro()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a0dd642..e12a22e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,12 +1,5 @@
add_subdirectory(ksendbugmail)
-if (HAVE_ATTICA)
- set (XMLGUI_EXTRA_LIBS ${XMLGUI_EXTRA_LIBS} KF5::Attica)
-endif ()
-if(WIN32)
- set (XMLGUI_EXTRA_LIBS ${XMLGUI_EXTRA_LIBS} Secur32) # GetUserNameEx()
-endif()
-
configure_file(config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h )
configure_file(
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 413fa92..c456ede 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -6,7 +6,7 @@ find_package(Qt5 5.2.0 CONFIG REQUIRED Test)
macro(xmlgui_executable_tests)
foreach(_testname ${ARGN})
add_executable(${_testname} ${_testname}.cpp)
- target_link_libraries(${_testname} Qt5::Test KF5::WidgetsAddons KF5::I18n KF5::XmlGui)
+ target_link_libraries(${_testname} Qt5::Test KF5::WidgetsAddons KF5::I18n KF5::XmlGui ${XMLGUI_EXTRA_LIBS})
ecm_mark_as_test(${_testname})
endforeach(_testname)
endmacro()
diff --git a/tests/krichtexteditor/CMakeLists.txt b/tests/krichtexteditor/CMakeLists.txt
index 45c1abe..b8d8b56 100644
--- a/tests/krichtexteditor/CMakeLists.txt
+++ b/tests/krichtexteditor/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
)
add_executable(krichtexteditor ${krichtexteditorSources} )
ecm_mark_as_test(krichtexteditor)
-target_link_libraries(krichtexteditor Qt5::Test KF5::ConfigWidgets KF5::TextWidgets KF5::XmlGui)
+target_link_libraries(krichtexteditor Qt5::Test KF5::ConfigWidgets KF5::TextWidgets KF5::XmlGui ${XMLGUI_EXTRA_LIBS})
#install(TARGETS krichtexteditor DESTINATION ${BIN_INSTALL_DIR})
#install(FILES krichtexteditorui.rc DESTINATION ${DATA_INSTALL_DIR}/krichtexteditor)

View File

@ -3,7 +3,7 @@
source ../frameworks.conf
pkgname=libdbusmenu-qt5
pkgver=0.9.2+14.04.20140218.2
pkgver=0.9.3+14.04.20140314
pkgrel=1
pkgdesc="A library that provides a Qt implementation of the DBusMenu spec"
arch=('i686' 'x86_64')
@ -12,7 +12,7 @@ license=('GPL')
depends=('qt5-base')
makedepends=('cmake')
source=("http://archive.ubuntu.com/ubuntu/pool/main/libd/libdbusmenu-qt/libdbusmenu-qt_${pkgver}.orig.tar.gz")
md5sums=('2a1fd81857be1687520ff0b93f39a10d')
md5sums=('0e8df8b3e082afb4ecbb7b0279cb0b98')
options=(strip debug)
prepare() {