obconf-qt, update to 0.14.1

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: obconf-qt, update to 0.14.1
From: pin <voidpin%protonmail.com@localhost>
Date: Tue, 07 Jan 2020 13:12:40 +0000
Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Tue Jan 7 14:12:40 2020 +0100
Changeset:	0e36a21e7843625d1e8532434395d9f89eec5466

Modified Files:
	obconf-qt/Makefile
	obconf-qt/PLIST
	obconf-qt/distinfo
Removed Files:
	obconf-qt/patches/patch-CMakeLists.txt
	obconf-qt/patches/patch-src_CMakeLists.txt
	obconf-qt/patches/patch-src_appearance.cpp

Log Message:
obconf-qt, update to 0.14.1

Update obconf-qt from 0.1.0 to 0.14.1
Too many changes to list, please refer to upstream lxqt.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0e36a21e7843625d1e8532434395d9f89eec5466

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 obconf-qt/Makefile                         | 27 ++++++---
 obconf-qt/PLIST                            | 32 +++++++++-
 obconf-qt/distinfo                         | 12 ++--
 obconf-qt/patches/patch-CMakeLists.txt     | 32 ----------
 obconf-qt/patches/patch-src_CMakeLists.txt | 93 ------------------------------
 obconf-qt/patches/patch-src_appearance.cpp | 16 -----
 6 files changed, 55 insertions(+), 157 deletions(-)

diffs:
diff --git a/obconf-qt/Makefile b/obconf-qt/Makefile
index 5b92bc5a8f..677b7646a1 100644
--- a/obconf-qt/Makefile
+++ b/obconf-qt/Makefile
@@ -1,22 +1,35 @@
-# $NetBSD: Makefile,v 1.3 2015/05/30 01:49:34 krytarowski Exp $
+# $NetBSD$
 
-.include "../../wip/liblxqt/Makefile.common"
-
-DISTNAME=	obconf-qt-0.1.0
+DISTNAME=	obconf-qt-0.14.1
 CATEGORIES=	x11
+MASTER_SITES=	https://downloads.lxqt.org/downloads/obconf-qt/0.14.1/
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://github.com/lxde/obconf-qt/
+HOMEPAGE=	https://lxqt.org/
 COMMENT=	Qt based configurator of OpenBox window manager
 LICENSE=	gnu-gpl-v2
 
+USE_CMAKE=	yes
 USE_TOOLS=	pkg-config
+USE_LANGUAGES=	c c++
+
+CONFIGURE_DIRS=	build
+CMAKE_ARG_PATH=	..
+
+CFLAGS.NetBSD+=	-D_NETBSD_SOURCE
+
+INSTALLATION_DIRS+=	bin
+
+pre-configure:
+	${MKDIR} -p ${WRKSRC}/build
 
-# pkgsrc does not support qt4 variant
-CONFIGURE_ENV=	USE_QT5=ON
+DEPENDS+=	lxqt-build-tools-[0-9]*:../../wip/lxqt-build-tools
 
 .include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../x11/qt5-qtx11extras/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../wm/openbox/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/obconf-qt/PLIST b/obconf-qt/PLIST
index 90bc48c37b..3595106915 100644
--- a/obconf-qt/PLIST
+++ b/obconf-qt/PLIST
@@ -1,4 +1,32 @@
-@comment $NetBSD: PLIST,v 1.2 2015/05/23 22:01:50 krytarowski Exp $
+@comment $NetBSD$
 bin/obconf-qt
 share/applications/obconf-qt.desktop
-share/pixmaps/obconf-qt.png
+share/icons/hicolor/48x48/apps/obconf-qt.png
+share/obconf-qt/translations/obconf-qt_ca.qm
+share/obconf-qt/translations/obconf-qt_cs.qm
+share/obconf-qt/translations/obconf-qt_cy.qm
+share/obconf-qt/translations/obconf-qt_da.qm
+share/obconf-qt/translations/obconf-qt_de.qm
+share/obconf-qt/translations/obconf-qt_el.qm
+share/obconf-qt/translations/obconf-qt_es.qm
+share/obconf-qt/translations/obconf-qt_fr.qm
+share/obconf-qt/translations/obconf-qt_gl.qm
+share/obconf-qt/translations/obconf-qt_he.qm
+share/obconf-qt/translations/obconf-qt_hr.qm
+share/obconf-qt/translations/obconf-qt_hu.qm
+share/obconf-qt/translations/obconf-qt_id.qm
+share/obconf-qt/translations/obconf-qt_is.qm
+share/obconf-qt/translations/obconf-qt_it.qm
+share/obconf-qt/translations/obconf-qt_ja.qm
+share/obconf-qt/translations/obconf-qt_lt.qm
+share/obconf-qt/translations/obconf-qt_nb_NO.qm
+share/obconf-qt/translations/obconf-qt_nl.qm
+share/obconf-qt/translations/obconf-qt_pa.qm
+share/obconf-qt/translations/obconf-qt_pl.qm
+share/obconf-qt/translations/obconf-qt_pt.qm
+share/obconf-qt/translations/obconf-qt_pt_BR.qm
+share/obconf-qt/translations/obconf-qt_ru.qm
+share/obconf-qt/translations/obconf-qt_sv.qm
+share/obconf-qt/translations/obconf-qt_tr.qm
+share/obconf-qt/translations/obconf-qt_uk.qm
+share/obconf-qt/translations/obconf-qt_zh_CN.qm
diff --git a/obconf-qt/distinfo b/obconf-qt/distinfo
index 17f9aafdb1..8b42fb3324 100644
--- a/obconf-qt/distinfo
+++ b/obconf-qt/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.1 2015/05/23 00:57:50 krytarowski Exp $
+$NetBSD$
 
-SHA1 (obconf-qt-0.1.0.tar.gz) = b66819f0eddf77abb9ec1b0dba93185eb64dca25
-RMD160 (obconf-qt-0.1.0.tar.gz) = 7f3f9a8ecaf14bec0376dbeb780d2ab5cb023e8c
-Size (obconf-qt-0.1.0.tar.gz) = 64858 bytes
-SHA1 (patch-CMakeLists.txt) = 772606622bd3fb6377fa5c46141a9babcdf71500
-SHA1 (patch-src_CMakeLists.txt) = afa3d6c7543fcc8462290eb3d51ffd56e153b8c5
-SHA1 (patch-src_appearance.cpp) = cc0a8149d90e8f1f485e9e682444628b3ed19dba
+SHA1 (obconf-qt-0.14.1.tar.xz) = 1468271a9f09df9f83924e01172d7810242b1916
+RMD160 (obconf-qt-0.14.1.tar.xz) = 63335640475da1ee3620f746f3b6248747d0031b
+SHA512 (obconf-qt-0.14.1.tar.xz) = 7ae4feb8daa3853f768e9cb613fc99046f98744e03efc673ee9e5cb3d4ffa2861f2a9f762acd9c54ef2b9ca3f288d2901cdcce5c09db84689dd186006b8e26ed
+Size (obconf-qt-0.14.1.tar.xz) = 97032 bytes
diff --git a/obconf-qt/patches/patch-CMakeLists.txt b/obconf-qt/patches/patch-CMakeLists.txt
deleted file mode 100644
index 7d77f8110d..0000000000
--- a/obconf-qt/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2015/05/23 11:43:24 krytarowski Exp $
-
-Cherry-picked upstream patch adding Qt5 support
-https://github.com/lxde/obconf-qt/commit/49a4067c58711130848cf4a30a0c4eedead405ac
-
---- CMakeLists.txt.orig	2014-05-07 05:42:53.000000000 +0000
-+++ CMakeLists.txt
-@@ -4,7 +4,23 @@ cmake_minimum_required(VERSION 2.8.6)
- 
- find_program(SED_PROGRAM sed)
- 
--find_package(Qt4 REQUIRED QtCore QtGui) # Qt
-+# 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(Qt5X11Extras REQUIRED)
-+  find_package(Qt5LinguistTools REQUIRED QUIET)
-+  message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}")
-+else()
-+  find_package(Qt4 REQUIRED QtCore QtGui) # Qt
-+  include(${QT_USE_FILE})
-+  message(STATUS "Building with Qt${QTVERSION}")
-+endif()
-+
- find_package(PkgConfig)
- pkg_check_modules(GLIB REQUIRED
-   glib-2.0
diff --git a/obconf-qt/patches/patch-src_CMakeLists.txt b/obconf-qt/patches/patch-src_CMakeLists.txt
deleted file mode 100644
index a830bb9bfb..0000000000
--- a/obconf-qt/patches/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.1 2015/05/23 11:43:24 krytarowski Exp $
-
-Cherry-picked upstream patch adding Qt5 support
-https://github.com/lxde/obconf-qt/commit/49a4067c58711130848cf4a30a0c4eedead405ac
-
---- src/CMakeLists.txt.orig	2014-05-07 05:42:53.000000000 +0000
-+++ src/CMakeLists.txt
-@@ -1,17 +1,21 @@
- # set visibility to hidden to hide symbols, unlesss they're exporeted manually in the code
- set(CMAKE_CXX_FLAGS "-DQT_NO_KEYWORDS -fno-exceptions")
- 
-+if(USE_QT5)
-+    set(QTX_INCLUDE_DIRS "")
-+    set(QTX_LIBRARIES Qt5::Widgets Qt5::X11Extras)
-+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}
-   ${GLIB_INCLUDE_DIRS}
-   ${OPENBOX_INCLUDE_DIRS}
-   ${CMAKE_CURRENT_BINARY_DIR}
--  ${CMAKE_CURRENT_SOURCE_DIR}
--
- )
- 
--set(CMAKE_AUTOMOC TRUE)
--
- set(obconf-qt_SRCS
-   obconf-qt.cpp
-   maindialog.cpp
-@@ -32,9 +36,11 @@ set(obconf-qt_UIS
-   obconf.ui
- )
- 
--qt4_wrap_ui(obconf-qt_UI_H
--  ${obconf-qt_UIS}
--)
-+if(USE_QT5)
-+  qt5_wrap_ui(obconf-qt_UI_H ${obconf-qt_UIS})
-+else()
-+  qt4_wrap_ui(obconf-qt_UI_H ${obconf-qt_UIS})
-+endif()
- 
- # The ui code generated by Qt uic contains QMetaObject::connectSlotsByName()
- # but we don't want that. Fix it with sed.
-@@ -51,14 +57,25 @@ add_custom_command(
- 
- # add translation for obconf-qt
- option (UPDATE_TRANSLATIONS "Update source translation translations/*.ts files")
--if (UPDATE_TRANSLATIONS)
--  qt4_create_translation(QM_FILES
--    ${obconf-qt_SRCS}
--    ${obconf-qt_UI_H}
--    ${TS_FILES})
--else (UPDATE_TRANSLATIONS)
--  qt4_add_translation(QM_FILES ${TS_FILES})
--endif (UPDATE_TRANSLATIONS)
-+if(USE_QT5)
-+  if (UPDATE_TRANSLATIONS)
-+    qt5_create_translation(QM_FILES
-+      ${obconf-qt_SRCS}
-+      ${obconf-qt_UI_H}
-+      ${TS_FILES})
-+  else (UPDATE_TRANSLATIONS)
-+    qt5_add_translation(QM_FILES ${TS_FILES})
-+  endif (UPDATE_TRANSLATIONS)
-+else(USE_QT5) # use qt4
-+  if (UPDATE_TRANSLATIONS)
-+    qt4_create_translation(QM_FILES
-+      ${obconf-qt_SRCS}
-+      ${obconf-qt_UI_H}
-+      ${TS_FILES})
-+  else (UPDATE_TRANSLATIONS)
-+    qt4_add_translation(QM_FILES ${TS_FILES})
-+  endif (UPDATE_TRANSLATIONS)
-+endif(USE_QT5)
- add_custom_target (obconf-qt_translations DEPENDS ${QM_FILES})
- install(FILES ${QM_FILES} DESTINATION share/obconf-qt/translations)
- # prevent the generated files from being deleted during make clean
-@@ -78,8 +95,7 @@ add_definitions(
- )
- 
- target_link_libraries(obconf-qt
--  ${QT_QTCORE_LIBRARY}
--  ${QT_QTGUI_LIBRARY}
-+  ${QTX_LIBRARIES}
-   ${GLIB_LIBRARIES}
-   ${OPENBOX_LIBRARIES}
- )
diff --git a/obconf-qt/patches/patch-src_appearance.cpp b/obconf-qt/patches/patch-src_appearance.cpp
deleted file mode 100644
index 564175a84c..0000000000
--- a/obconf-qt/patches/patch-src_appearance.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_appearance.cpp,v 1.1 2015/05/23 11:43:24 krytarowski Exp $
-
-Cherry-picked upstream patch adding Qt5 support
-https://github.com/lxde/obconf-qt/commit/49a4067c58711130848cf4a30a0c4eedead405ac
-
---- src/appearance.cpp.orig	2014-05-07 05:42:53.000000000 +0000
-+++ src/appearance.cpp
-@@ -79,7 +79,7 @@ void MainDialog::on_title_layout_textCha
-   QByteArray layout;
-   // omit unknown chars
-   for(int i = 0; i < text.length(); ++i) {
--    char ch = text.at(i).toUpper().toAscii();
-+    char ch = text.at(i).toUpper().toLatin1();
-     if(strchr("NDSLIMC", ch))
-       layout += ch;
-   }
Prev by Date: doomlegacy-devel: Update to SVN revision 1498
Next by Date: New package, pavucontrol-qt
Previous by Thread: doomlegacy-devel: Update to SVN revision 1498
Next by Thread: New package, pavucontrol-qt
Indexes:
Home | Main Index | Thread Index | Old Index