Attachment #194596 for bug #229306




# Created by: Olivier Duchateau
# $FreeBSD$

PORTNAME=	obconf-qt
PORTVERSION=	0.13.0
CATEGORIES=	x11-wm
MASTER_SITES=	LXQT/${PORTNAME}

MAINTAINER=	jesper@schmitz.computer
COMMENT=	Qt port of preferences manager for the Openbox

LICENSE=	GPLv2

LIB_DEPENDS=	libobt.so:x11-wm/openbox \
	libfontconfig.so:x11-fonts/fontconfig \
	libfreetype.so:print/freetype2 \
	libImlib2.so:graphics/imlib2

USES=	cmake:outsource compiler:c++11-lang gettext-runtime localbase \
	lxqt pkgconfig tar:xz
USE_QT5=	buildtools_build qmake_build core gui linguisttools \
	widgets x11extras
USE_LXQT=	buildtools
USE_GNOME=	glib20 pango librsvg2 gdkpixbuf2 libxml2 cairo
USE_XORG=	ice sm x11 xft

.include <bsd.port.mk>

Line 0 Link Here

(-)x11-wm/obconf-qt/distinfo (+3 lines)
	1	TIMESTAMP = 1527328597
	2	SHA256 (lxqt/obconf-qt-0.13.0.tar.xz) = cec24a319ad87c6c04459c66ad9d14f0ce9d6b0cad6eb5584376b72a6eb07fb9
	3	SIZE (lxqt/obconf-qt-0.13.0.tar.xz) = 34348

Line 0 Link Here

(-)x11-wm/obconf-qt/files/patch-src_CMakeLists.txt (+11 lines)
	1	--- src/CMakeLists.txt.orig 2016-09-23 22:50:22 UTC
	2	+++ src/CMakeLists.txt
	3	@@ -104,7 +104,7 @@ add_definitions(
	4
	5	target_link_libraries(obconf-qt
	6	${QTX_LIBRARIES}
	7	- ${GLIB_LIBRARIES}
	8	+ ${GLIB_LDFLAGS}
	9	${OPENBOX_LIBRARIES}
	10	)
	11




--- src/archive.cpp.orig	2015-02-25 14:12:33 UTC
+++ src/archive.cpp
@@ -1,4 +1,5 @@
 #include <QMessageBox>
+#include <QtGlobal>
 
 #include <glib.h>
 #include <string.h>
@@ -161,6 +162,7 @@ static gchar* install_theme_to(const gch
     GError *e = NULL;
     gchar *name = NULL;
 
+#if defined(Q_OS_LINUX)
     argv = g_new(gchar*, 11);
     argv[0] = g_strdup("tar");
     argv[1] = g_strdup("-x");
@@ -173,6 +175,18 @@ static gchar* install_theme_to(const gch
     argv[8] = g_strdup(to);
     argv[9] = g_strdup("*/openbox-3/");
     argv[10] = NULL;
+#else
+    argv = g_new(gchar*, 9);
+    argv[0] = g_strdup("tar");
+    argv[1] = g_strdup("-x");
+    argv[2] = g_strdup("-v");
+    argv[3] = g_strdup("-z");
+    argv[4] = g_strdup("-f");
+    argv[5] = g_strdup(file);
+    argv[6] = g_strdup("-C");
+    argv[7] = g_strdup(to);
+    argv[8] = NULL;
+#endif
     if (!g_spawn_sync(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL,
                       &outtxt, &errtxt, &exitcode, &e))
         QMessageBox::critical(NULL, QString(), QObject::tr("Unable to run the \"tar\" command: %1")




Create theme is not working, broken by design

--- src/obconf.ui.orig	2015-02-25 14:12:33 UTC
+++ src/obconf.ui
@@ -97,13 +97,6 @@
            </property>
           </widget>
          </item>
-         <item>
-          <widget class="QPushButton" name="theme_archive">
-           <property name="text">
-            <string>Create a theme &amp;archive (.obt)...</string>
-           </property>
-          </widget>
-         </item>
         </layout>
        </widget>
        <widget class="QWidget" name="appearancePage">

Line 0 Link Here

(-)x11-wm/obconf-qt/pkg-descr (+3 lines)
	1	Openbox configuration tool written in Qt.
	2
	3	WWW: https://github.com/lxde/obconf-qt

Line 0 Link Here

(-)x11-wm/obconf-qt/pkg-plist (+3 lines)
	1	bin/obconf-qt
	2	share/applications/obconf-qt.desktop
	3	share/icons/hicolor/48x48/apps/obconf-qt.png

Return to bug 229306

Line 0 Link Here

(-)x11-wm/obconf-qt/Makefile (+27 lines)
	1	# Created by: Olivier Duchateau
	2	# $FreeBSD$
	3
	4	PORTNAME= obconf-qt
	5	PORTVERSION= 0.13.0
	6	CATEGORIES= x11-wm
	7	MASTER_SITES= LXQT/${PORTNAME}
	8
	9	MAINTAINER= jesper@schmitz.computer
	10	COMMENT= Qt port of preferences manager for the Openbox
	11
	12	LICENSE= GPLv2
	13
	14	LIB_DEPENDS= libobt.so:x11-wm/openbox \
	15	libfontconfig.so:x11-fonts/fontconfig \
	16	libfreetype.so:print/freetype2 \
	17	libImlib2.so:graphics/imlib2
	18
	19	USES= cmake:outsource compiler:c++11-lang gettext-runtime localbase \
	20	lxqt pkgconfig tar:xz
	21	USE_QT5= buildtools_build qmake_build core gui linguisttools \
	22	widgets x11extras
	23	USE_LXQT= buildtools
	24	USE_GNOME= glib20 pango librsvg2 gdkpixbuf2 libxml2 cairo
	25	USE_XORG= ice sm x11 xft
	26
	27	.include <bsd.port.mk>

Line 0 Link Here

(-)x11-wm/obconf-qt/files/patch-src_archive.cpp (+35 lines)
	1	--- src/archive.cpp.orig 2015-02-25 14:12:33 UTC
	2	+++ src/archive.cpp
	3	@@ -1,4 +1,5 @@
	4	#include <QMessageBox>
	5	+#include <QtGlobal>
	6
	7	#include <glib.h>
	8	#include <string.h>
	9	@@ -161,6 +162,7 @@ static gchar* install_theme_to(const gch
	10	GError *e = NULL;
	11	gchar *name = NULL;
	12
	13	+#if defined(Q_OS_LINUX)
	14	argv = g_new(gchar*, 11);
	15	argv[0] = g_strdup("tar");
	16	argv[1] = g_strdup("-x");
	17	@@ -173,6 +175,18 @@ static gchar* install_theme_to(const gch
	18	argv[8] = g_strdup(to);
	19	argv[9] = g_strdup("*/openbox-3/");
	20	argv[10] = NULL;
	21	+#else
	22	+ argv = g_new(gchar*, 9);
	23	+ argv[0] = g_strdup("tar");
	24	+ argv[1] = g_strdup("-x");
	25	+ argv[2] = g_strdup("-v");
	26	+ argv[3] = g_strdup("-z");
	27	+ argv[4] = g_strdup("-f");
	28	+ argv[5] = g_strdup(file);
	29	+ argv[6] = g_strdup("-C");
	30	+ argv[7] = g_strdup(to);
	31	+ argv[8] = NULL;
	32	+#endif
	33	if (!g_spawn_sync(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL,
	34	&outtxt, &errtxt, &exitcode, &e))
	35	QMessageBox::critical(NULL, QString(), QObject::tr("Unable to run the \"tar\" command: %1")

Line 0 Link Here

(-)x11-wm/obconf-qt/files/patch-src_obconf.ui (+18 lines)
	1	Create theme is not working, broken by design
	2
	3	--- src/obconf.ui.orig 2015-02-25 14:12:33 UTC
	4	+++ src/obconf.ui
	5	@@ -97,13 +97,6 @@
	6	</property>
	7	</widget>
	8	</item>
	9	- <item>
	10	- <widget class="QPushButton" name="theme_archive">
	11	- <property name="text">
	12	- <string>Create a theme &archive (.obt)...</string>
	13	- </property>
	14	- </widget>
	15	- </item>
	16	</layout>
	17	</widget>
	18	<widget class="QWidget" name="appearancePage">