diff --git a/srcpkgs/compton-conf/patches/qt5.patch b/srcpkgs/compton-conf/patches/qt5.patch deleted file mode 100644 index b71263faf8e..00000000000 --- a/srcpkgs/compton-conf/patches/qt5.patch +++ /dev/null @@ -1,85 +0,0 @@ -commit 7407665b4948cb9eee6e3d89daf65a23e7977d34 -Author: Hong Jen Yee (PCMan) -Date: Sat Jun 21 06:04:09 2014 +0100 - - Add Qt5 support. - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f298def..e65aa5e 100644 ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -2,8 +2,22 @@ project(compton-conf) - - cmake_minimum_required(VERSION 2.8.6) - --# Qt --find_package(Qt4 REQUIRED QtCore QtGui QtDbus) -+# Support Qt5 -+option(USE_QT5 "Build with Qt5." $ENV{USE_QT5}) -+set(CMAKE_INCLUDE_CURRENT_DIR ON) -+set(CMAKE_POSITION_INDEPENDENT_CODE ON) -+set(CMAKE_AUTOMOC ON) -+if(USE_QT5) -+ cmake_minimum_required(VERSION 2.8.11) -+ find_package(Qt5Widgets REQUIRED) -+ find_package(Qt5DBus REQUIRED) -+ find_package(Qt5LinguistTools REQUIRED QUIET) -+ message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}") -+else() -+ find_package(Qt4 REQUIRED QtCore QtGui QtDbus) -+ include(${QT_USE_FILE}) -+ message(STATUS "Building with Qt${QTVERSION}") -+endif() - - # libconfig using pkg-config - find_package(PkgConfig REQUIRED) -@@ -15,14 +29,20 @@ include(GNUInstallDirs REQUIRED) - - set(CMAKE_CXX_FLAGS "-DQT_NO_KEYWORDS -fno-exceptions") - -+if(USE_QT5) -+ set(QTX_INCLUDE_DIRS "") -+ set(QTX_LIBRARIES Qt5::Widgets Qt5::DBus) -+else() -+ set(QTX_INCLUDE_DIRS ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTDBUS_DIR}) -+ set(QTX_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY}) -+endif() -+ - include_directories( -- ${QT_INCLUDES} -+ ${QTX_INCLUDE_DIRS} - ${LIBCONFIG_INCLUDE_DIRS} - ${CMAKE_CURRENT_BINARY_DIR} - ) - --set(CMAKE_AUTOMOC TRUE) -- - set(compton-conf_SRCS - maindialog.cpp - compton-conf.cpp -@@ -32,9 +52,11 @@ set(compton-conf_UIS - maindialog.ui - ) - --qt4_wrap_ui(compton-conf_UI_H -- ${compton-conf_UIS} --) -+if(USE_QT5) -+ qt5_wrap_ui(compton-conf_UI_H ${compton-conf_UIS}) -+else() -+ qt4_wrap_ui(compton-conf_UI_H ${compton-conf_UIS}) -+endif() - - add_definitions( - -DCOMPTON_CONF_DATA_DIR="${CMAKE_INSTALL_FULL_DATADIR}/compton-conf" -@@ -46,9 +68,7 @@ add_executable(compton-conf - ) - - target_link_libraries(compton-conf -- ${QT_QTCORE_LIBRARY} -- ${QT_QTGUI_LIBRARY} -- ${QT_QTDBUS_LIBRARY} -+ ${QTX_LIBRARIES} - ${LIBCONFIG_LIBRARIES} - ) - diff --git a/srcpkgs/compton-conf/template b/srcpkgs/compton-conf/template index 8b549c66d8f..3402348fd50 100644 --- a/srcpkgs/compton-conf/template +++ b/srcpkgs/compton-conf/template @@ -1,17 +1,15 @@ # Template file for 'compton-conf' pkgname=compton-conf -version=0.1.0 -revision=2 -create_wrksrc=yes +version=0.2.0 +revision=1 build_style=cmake -configure_args="-DUSE_QT5=1" -hostmakedepends="cmake pkg-config" -makedepends="qt5-x11extras-devel qt5-tools-devel libconfig-devel" +configure_args="-DPULL_TRANSLATIONS=0" +hostmakedepends="pkg-config" +makedepends="liblxqt-devel libconfig-devel" depends="virtual?compton desktop-file-utils" -depends="desktop-file-utils" -short_desc="LXQT compton compositor UI" +short_desc="LXQt GUI configuration tool for compton" maintainer="Juan RP " license="LGPL-2.1" homepage="http://lxqt.org/" -distfiles="http://downloads.lxqt.org/${pkgname}/${version}/${pkgname}-${version}.tar.xz" -checksum=f362790ae1a20c7ac65790e411cb792200c2430199186affa70dba3ebb01dedf +distfiles="https://github.com/lxde/compton-conf/releases/download/${version}/compton-conf-${version}.tar.xz" +checksum=56d5f15ec024a8657e4b8cc4305fd12f90f8b1cce60f445bc4644c91d599df68 diff --git a/srcpkgs/compton-conf/update b/srcpkgs/compton-conf/update deleted file mode 100644 index 4be7da4a9e8..00000000000 --- a/srcpkgs/compton-conf/update +++ /dev/null @@ -1,2 +0,0 @@ -site="http://downloads.lxqt.org/${pkgname}" -pattern='href="\K[\d.]+'