Attachment 156257 Details for Bug 199871 – x11-themes/qtcurve 1.8.18 update and overhaul

[patch] x11-themes/qtcurve 1.8.18 update and overhaul

x11-themes_qtcurve.patch (text/plain), 19.55 KB, created by Matthew Rezny on 2015-05-03 00:04:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Rezny

Created: 2015-05-03 00:04:55 UTC

Size: 19.55 KB

patch

obsolete

>Index: x11-themes/Makefile
>===================================================================
>--- x11-themes/Makefile	(revision 385199)
>+++ x11-themes/Makefile	(working copy)
>@@ -153,6 +153,8 @@
>     SUBDIR += qtcurve-gtk2
>     SUBDIR += qtcurve-kde4
>     SUBDIR += qtcurve-qt4
>+    SUBDIR += qtcurve-qt5
>+    SUBDIR += qtcurve-utils
>     SUBDIR += rezlooks
>     SUBDIR += sawfish-themes
>     SUBDIR += slim-themes
>Index: x11-themes/qtcurve-gtk2/Makefile
>===================================================================
>--- x11-themes/qtcurve-gtk2/Makefile	(revision 385199)
>+++ x11-themes/qtcurve-gtk2/Makefile	(working copy)
>@@ -1,18 +1,15 @@
>-# Created by: Dmitry Klimov <lazyklimm@gmail.com>
> # $FreeBSD$
> 
> PORTNAME=	qtcurve
>-PORTVERSION=	1.8.16
>-CATEGORIES=	x11-themes
>-MASTER_SITES=	http://craigd.wikispaces.com/file/view/
> PKGNAMEPREFIX=	gtk2-
> PKGNAMESUFFIX=	-theme
>-DISTNAME=	QtCurve-Gtk2-${PORTVERSION}
> 
>-MAINTAINER=	makc@FreeBSD.org
> COMMENT=	QtCurve GTK2 Theme Engine
> 
>-USES=		cmake pkgconfig tar:bzip2
>+MASTERDIR=	${.CURDIR}/../${PORTNAME}-utils
>+PKGDIR=		${.CURDIR}
>+
> USE_GNOME=	gtk20
>+SLAVE_ARGS=	-DENABLE_GTK2:BOOL=ON
> 
>-.include <bsd.port.mk>
>+.include "${MASTERDIR}/Makefile"
>Index: x11-themes/qtcurve-gtk2/distinfo
>===================================================================
>--- x11-themes/qtcurve-gtk2/distinfo	(revision 385199)
>+++ x11-themes/qtcurve-gtk2/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (QtCurve-Gtk2-1.8.16.tar.bz2) = 8b33dfc4426dc0a9e5f6870de5975c81af8223abaae7b65b5906144bacbc4f90
>-SIZE (QtCurve-Gtk2-1.8.16.tar.bz2) = 184324
>+SHA256 (1.8.18.tar.gz) = 85997c9fa4a948945d719342f5993486aecf189d176408280bad9af8600873a6
>+SIZE (1.8.18.tar.gz) = 991195
>Index: x11-themes/qtcurve-gtk2/pkg-descr
>===================================================================
>--- x11-themes/qtcurve-gtk2/pkg-descr	(revision 385199)
>+++ x11-themes/qtcurve-gtk2/pkg-descr	(working copy)
>@@ -1,4 +1,4 @@
>-QtCurve is a set of widget styles for Qt4/KDE4, KDE3 and Gtk2 based apps.
>+QtCurve is a set of widget styles for Qt4/KDE4, Qt5 and Gtk2 based apps.
> This port provides GTK2 theme engine.
> 
>-WWW:	http://www.kde-look.org/content/show.php?content=40492
>+WWW: https://projects.kde.org/projects/playground/base/qtcurve
>Index: x11-themes/qtcurve-gtk2/pkg-plist
>===================================================================
>--- x11-themes/qtcurve-gtk2/pkg-plist	(revision 385199)
>+++ x11-themes/qtcurve-gtk2/pkg-plist	(working copy)
>@@ -1,9 +1,22 @@
> lib/gtk-2.0/%%GTK2_VERSION%%/engines/libqtcurve.so
>+lib/libqtcurve-cairo.so
>+lib/libqtcurve-cairo.so.0
>+lib/libqtcurve-cairo.so.0.1
>+@comment lib/libqtcurve-utils.so
>+@comment lib/libqtcurve-utils.so.1
>+@comment lib/libqtcurve-utils.so.1.0
>+@comment share/locale/ko/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/ru/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/tr/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/uk/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/zh_CN/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/zh_HK/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/zh_TW/LC_MESSAGES/qtcurve.mo
> share/themes/QtCurve/gtk-2.0/gtkrc
> share/themes/QtCurve/gtk-2.0/icons3
> share/themes/QtCurve/gtk-2.0/icons4
> share/themes/QtCurve/gtk-2.0/kdeglobals
> share/themes/QtCurve/gtk-2.0/map_kde_icons.pl
>+share/themes/QtCurve/mozilla/QtCurve-KDEButtonOrder.css
> share/themes/QtCurve/mozilla/QtCurve.css
>-share/themes/QtCurve/mozilla/QtCurve-KDEButtonOrder.css
> share/themes/QtCurve/mozilla/preferences-rev.xml
>Index: x11-themes/qtcurve-kde4/Makefile
>===================================================================
>--- x11-themes/qtcurve-kde4/Makefile	(revision 385199)
>+++ x11-themes/qtcurve-kde4/Makefile	(working copy)
>@@ -1,18 +1,17 @@
> # $FreeBSD$
> 
> PORTNAME=	qtcurve
>-PORTVERSION=	1.8.14
>-PORTREVISION=	4
>-CATEGORIES=	x11-themes
>-MASTER_SITES=	http://craigd.wikispaces.com/file/view/
> PKGNAMEPREFIX=	kde4-style-
>-DISTNAME=	QtCurve-KDE4-${PORTVERSION}
>+PKGNAMESUFFIX=	#empty
> 
>-MAINTAINER=	makc@FreeBSD.org
>-COMMENT=	QtCurve KDE4 widget style
>+COMMENT=	QtCurve KDE4 Widget Style
> 
>-USES=		cmake gettext-tools tar:bzip2
>-USE_QT4=	qmake_build uic_build moc_build rcc_build
>-USE_KDE4=	kdelibs workspace kdeprefix automoc4
>+MASTERDIR=	${.CURDIR}/../${PORTNAME}-utils
>+PKGDIR=		${.CURDIR}
> 
>-.include <bsd.port.mk>
>+USE_QT4=	dbus gui svg imageformats_run \
>+		moc_build qmake_build rcc_build uic_build
>+USE_KDE4=	automoc4 kdelibs kdeprefix workspace
>+SLAVE_ARGS=	-DENABLE_QT4:BOOL=ON
>+
>+.include "${MASTERDIR}/Makefile"
>Index: x11-themes/qtcurve-kde4/distinfo
>===================================================================
>--- x11-themes/qtcurve-kde4/distinfo	(revision 385199)
>+++ x11-themes/qtcurve-kde4/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (QtCurve-KDE4-1.8.14.tar.bz2) = ff2f4731a0fd3c0a246a4c9099ac8a117bba463fd7cc00490acb6525ea463404
>-SIZE (QtCurve-KDE4-1.8.14.tar.bz2) = 383313
>+SHA256 (1.8.18.tar.gz) = 85997c9fa4a948945d719342f5993486aecf189d176408280bad9af8600873a6
>+SIZE (1.8.18.tar.gz) = 991195
>Index: x11-themes/qtcurve-kde4/pkg-descr
>===================================================================
>--- x11-themes/qtcurve-kde4/pkg-descr	(revision 385199)
>+++ x11-themes/qtcurve-kde4/pkg-descr	(working copy)
>@@ -1,4 +1,4 @@
>-QtCurve is a set of widget styles for Qt4/KDE4, KDE3 and Gtk2 based apps.
>+QtCurve is a set of widget styles for Qt4/KDE4, Qt5 and Gtk2 based apps.
> This port provides KDE4 theme engine.
> 
>-WWW:	http://www.kde-look.org/content/show.php?content=40492
>+WWW: https://projects.kde.org/projects/playground/base/qtcurve
>Index: x11-themes/qtcurve-kde4/pkg-plist
>===================================================================
>--- x11-themes/qtcurve-kde4/pkg-plist	(revision 385199)
>+++ x11-themes/qtcurve-kde4/pkg-plist	(working copy)
>@@ -2,6 +2,9 @@
> lib/kde4/kwin3_qtcurve.so
> lib/kde4/kwin_qtcurve_config.so
> lib/kde4/plugins/styles/qtcurve.so
>+@comment lib/libqtcurve-utils.so
>+@comment lib/libqtcurve-utils.so.1
>+@comment lib/libqtcurve-utils.so.1.0
> share/apps/QtCurve/Agua.qtcurve
> share/apps/QtCurve/Agua_II.qtcurve
> share/apps/QtCurve/Curve.qtcurve
>@@ -19,9 +22,10 @@
> share/apps/color-schemes/QtCurveAgua.colors
> share/apps/kstyle/themes/qtcurve.themerc
> share/apps/kwin/qtcurve.desktop
>-share/locale/ko/LC_MESSAGES/qtcurve.mo
>-share/locale/tr/LC_MESSAGES/qtcurve.mo
>-share/locale/uk/LC_MESSAGES/qtcurve.mo
>-share/locale/zh_CN/LC_MESSAGES/qtcurve.mo
>-share/locale/zh_HK/LC_MESSAGES/qtcurve.mo
>-share/locale/zh_TW/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/ko/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/ru/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/tr/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/uk/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/zh_CN/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/zh_HK/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/zh_TW/LC_MESSAGES/qtcurve.mo
>Index: x11-themes/qtcurve-qt4/Makefile
>===================================================================
>--- x11-themes/qtcurve-qt4/Makefile	(revision 385199)
>+++ x11-themes/qtcurve-qt4/Makefile	(working copy)
>@@ -1,22 +1,17 @@
> # $FreeBSD$
> 
> PORTNAME=	qtcurve
>-PORTVERSION=	1.8.14
>-CATEGORIES=	x11-themes
>-MASTER_SITES=	http://craigd.wikispaces.com/file/view/
> PKGNAMEPREFIX=	qt4-style-
>-DISTNAME=	QtCurve-KDE4-${PORTVERSION}
>+PKGNAMESUFFIX=	#empty
> 
>-MAINTAINER=	makc@FreeBSD.org
>-COMMENT=	QtCurve Qt4 widget style
>+COMMENT=	QtCurve Qt4 Widget Style
> 
>-USES=		cmake tar:bzip2
>+MASTERDIR=	${.CURDIR}/../${PORTNAME}-utils
>+PKGDIR=		${.CURDIR}
>+
> USE_QT4=	dbus gui svg imageformats_run \
>-		qmake_build uic_build moc_build rcc_build
>-CFLAGS+=	-I${LOCALBASE}/include
>-CMAKE_ARGS+=	-DQTC_QT_ONLY:BOOL=ON \
>-		-DQTC_DISABLE_KDEFILEDIALOG_CALLS:BOOL=ON
>+		moc_build qmake_build rcc_build uic_build
>+SLAVE_ARGS=	-DENABLE_QT4:BOOL=ON \
>+		-DQTC_QT4_ENABLE_KDE:BOOL=OFF
> 
>-PLIST_FILES=	${QT_PLUGINDIR_REL}/styles/qtcurve.so
>-
>-.include <bsd.port.mk>
>+.include "${MASTERDIR}/Makefile"
>Index: x11-themes/qtcurve-qt4/distinfo
>===================================================================
>--- x11-themes/qtcurve-qt4/distinfo	(revision 385199)
>+++ x11-themes/qtcurve-qt4/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (QtCurve-KDE4-1.8.14.tar.bz2) = ff2f4731a0fd3c0a246a4c9099ac8a117bba463fd7cc00490acb6525ea463404
>-SIZE (QtCurve-KDE4-1.8.14.tar.bz2) = 383313
>+SHA256 (1.8.18.tar.gz) = 85997c9fa4a948945d719342f5993486aecf189d176408280bad9af8600873a6
>+SIZE (1.8.18.tar.gz) = 991195
>Index: x11-themes/qtcurve-qt4/pkg-descr
>===================================================================
>--- x11-themes/qtcurve-qt4/pkg-descr	(revision 385199)
>+++ x11-themes/qtcurve-qt4/pkg-descr	(working copy)
>@@ -1,4 +1,4 @@
>-QtCurve is a set of widget styles for Qt4/KDE4, KDE3 and Gtk2 based apps.
>+QtCurve is a set of widget styles for Qt4/KDE4, Qt5 and Gtk2 based apps.
> This port provides Qt4 style plugin.
> 
>-WWW:	http://www.kde-look.org/content/show.php?content=40492
>+WWW: https://projects.kde.org/projects/playground/base/qtcurve
>Index: x11-themes/qtcurve-qt4/pkg-plist
>===================================================================
>--- x11-themes/qtcurve-qt4/pkg-plist	(revision 0)
>+++ x11-themes/qtcurve-qt4/pkg-plist	(working copy)
>@@ -0,0 +1,11 @@
>+@comment lib/libqtcurve-utils.so
>+@comment lib/libqtcurve-utils.so.1
>+@comment lib/libqtcurve-utils.so.1.0
>+%%QT_PLUGINDIR%%/styles/qtcurve.so
>+@comment share/locale/ko/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/ru/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/tr/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/uk/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/zh_CN/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/zh_HK/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/zh_TW/LC_MESSAGES/qtcurve.mo
>Index: x11-themes/qtcurve-qt5/Makefile
>===================================================================
>--- x11-themes/qtcurve-qt5/Makefile	(revision 0)
>+++ x11-themes/qtcurve-qt5/Makefile	(working copy)
>@@ -0,0 +1,16 @@
>+# $FreeBSD$
>+
>+PORTNAME=	qtcurve
>+PKGNAMEPREFIX=	qt5-style-
>+PKGNAMESUFFIX=	#empty
>+
>+COMMENT=	QtCurve Qt5 Widget Style
>+
>+MASTERDIR=	${.CURDIR}/../${PORTNAME}-utils
>+PKGDIR=		${.CURDIR}
>+USE_QT5=	dbus gui svg imageformats_run \
>+		buildtools_build qmake_build
>+SLAVE_ARGS=	-DENABLE_QT5:BOOL=ON \
>+		-DQTC_QT5_ENABLE_KDE:BOOL=OFF
>+
>+.include "${MASTERDIR}/Makefile"
>Index: x11-themes/qtcurve-qt5/distinfo
>===================================================================
>--- x11-themes/qtcurve-qt5/distinfo	(revision 0)
>+++ x11-themes/qtcurve-qt5/distinfo	(working copy)
>@@ -0,0 +1,2 @@
>+SHA256 (1.8.18.tar.gz) = 85997c9fa4a948945d719342f5993486aecf189d176408280bad9af8600873a6
>+SIZE (1.8.18.tar.gz) = 991195
>Index: x11-themes/qtcurve-qt5/pkg-descr
>===================================================================
>--- x11-themes/qtcurve-qt5/pkg-descr	(revision 0)
>+++ x11-themes/qtcurve-qt5/pkg-descr	(working copy)
>@@ -0,0 +1,4 @@
>+QtCurve is a set of widget styles for Qt4/KDE4, Qt5 and Gtk2 based apps.
>+This port provides Qt5 style plugin.
>+
>+WWW: https://projects.kde.org/projects/playground/base/qtcurve
>Index: x11-themes/qtcurve-qt5/pkg-plist
>===================================================================
>--- x11-themes/qtcurve-qt5/pkg-plist	(revision 0)
>+++ x11-themes/qtcurve-qt5/pkg-plist	(working copy)
>@@ -0,0 +1,11 @@
>+@comment lib/libqtcurve-utils.so
>+@comment lib/libqtcurve-utils.so.1
>+@comment lib/libqtcurve-utils.so.1.0
>+%%QT_PLUGINDIR%%/styles/qtcurve.so
>+@comment share/locale/ko/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/ru/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/tr/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/uk/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/zh_CN/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/zh_HK/LC_MESSAGES/qtcurve.mo
>+@comment share/locale/zh_TW/LC_MESSAGES/qtcurve.mo
>Index: x11-themes/qtcurve-utils/Makefile
>===================================================================
>--- x11-themes/qtcurve-utils/Makefile	(revision 0)
>+++ x11-themes/qtcurve-utils/Makefile	(working copy)
>@@ -0,0 +1,28 @@
>+# $FreeBSD$
>+
>+PORTNAME=	qtcurve
>+PORTVERSION=	1.8.18
>+CATEGORIES=	x11-themes
>+MASTER_SITES=	https://github.com/QtCurve/${PORTNAME}/archive/
>+PKGNAMESUFFIX?=	-utils
>+DISTFILES=	${PORTVERSION}${EXTRACT_SUFX}
>+
>+MAINTAINER=	makc@FreeBSD.org
>+COMMENT?=	QtCurve Shared Resources
>+
>+LICENSE=	LGPL21
>+
>+.if defined(SLAVE_ARGS)
>+RUN_DEPENDS=	${LOCALBASE}/lib/libqtcurve-utils.so:${PORTSDIR}/${CATEGORIES}/${PORTNAME}-utils
>+.endif
>+
>+USES=		cmake compiler:c++0x execinfo gettext-tools pkgconfig
>+USE_LDCONFIG=	yes
>+USE_XORG=	xcb
>+LDFLAGS+=	-L${LOCALBASE}/lib
>+CMAKE_ARGS+=	-DENABLE_GTK2:BOOL=OFF \
>+		-DENABLE_QT4:BOOL=OFF \
>+		-DENABLE_QT5:BOOL=OFF \
>+		${SLAVE_ARGS}
>+
>+.include <bsd.port.mk>
>Index: x11-themes/qtcurve-utils/distinfo
>===================================================================
>--- x11-themes/qtcurve-utils/distinfo	(revision 0)
>+++ x11-themes/qtcurve-utils/distinfo	(working copy)
>@@ -0,0 +1,2 @@
>+SHA256 (1.8.18.tar.gz) = 85997c9fa4a948945d719342f5993486aecf189d176408280bad9af8600873a6
>+SIZE (1.8.18.tar.gz) = 991195
>Index: x11-themes/qtcurve-utils/files/lib_utils_x11helpers.c
>===================================================================
>--- x11-themes/qtcurve-utils/files/lib_utils_x11helpers.c	(revision 0)
>+++ x11-themes/qtcurve-utils/files/lib_utils_x11helpers.c	(working copy)
>@@ -0,0 +1,22 @@
>+From: Yichao Yu <yyc1992@gmail.com>
>+Date: Sun, 02 Feb 2014 12:11:06 +0000
>+Subject: [lib/utils/x11shadow] typo in shadow color .... #54
>+X-Git-Url: http://quickgit.kde.org/?p=qtcurve.git&a=commitdiff&h=bdf0a5ce3ecc7ac0a7f9636358d444b7c4305828
>+---
>+[lib/utils/x11shadow] typo in shadow color .... #54
>+---
>+
>+
>+--- lib/utils/x11helpers.c
>++++ lib/utils/x11helpers.c
>+@@ -77,7 +77,7 @@
>+ {
>+     int shadow_size = 30;
>+     int shadow_radius = 4;
>+-    QtcColor c1 = {0.5, 0.4, 0.4};
>++    QtcColor c1 = {0.4, 0.4, 0.4};
>+     QtcColor c2 = {0.2, 0.2, 0.2};
>+     QtcImage *shadow_images[8];
>+     qtcShadowCreate(shadow_size, &c1, &c2, shadow_radius, false,
>+
>+
>Index: x11-themes/qtcurve-utils/files/patch-lib_utils_CMakeLists.txt
>===================================================================
>--- x11-themes/qtcurve-utils/files/patch-lib_utils_CMakeLists.txt	(revision 0)
>+++ x11-themes/qtcurve-utils/files/patch-lib_utils_CMakeLists.txt	(working copy)
>@@ -0,0 +1,11 @@
>+--- lib/utils/CMakeLists.txt.orig	2014-01-25 20:13:54 UTC
>++++ lib/utils/CMakeLists.txt
>+@@ -13,7 +13,7 @@ set(qtcurve_utils_SRCS
>+   x11helpers.c
>+   x11wrap.c)
>+ set(qtcurve_utils_LINKS
>+-  m rt dl ${LIBEXECINFO_LIBRARIES} pthread)
>++  m rt ${LIBEXECINFO_LIBRARIES} pthread)
>+ 
>+ include_directories("${CMAKE_CURRENT_BINARY_DIR}")
>+ 
>Index: x11-themes/qtcurve-utils/files/patch-lib_utils_fd__utils.c
>===================================================================
>--- x11-themes/qtcurve-utils/files/patch-lib_utils_fd__utils.c	(revision 0)
>+++ x11-themes/qtcurve-utils/files/patch-lib_utils_fd__utils.c	(working copy)
>@@ -0,0 +1,10 @@
>+--- lib/utils/fd_utils.c.orig	2014-01-25 20:13:54 UTC
>++++ lib/utils/fd_utils.c
>+@@ -21,6 +21,7 @@
>+ 
>+ #include "fd_utils.h"
>+ #include <sys/socket.h>
>++#include <sys/types.h>
>+ #include <fcntl.h>
>+ 
>+ QTC_EXPORT bool
>Index: x11-themes/qtcurve-utils/files/patch-lib_utils_map.c
>===================================================================
>--- x11-themes/qtcurve-utils/files/patch-lib_utils_map.c	(revision 0)
>+++ x11-themes/qtcurve-utils/files/patch-lib_utils_map.c	(working copy)
>@@ -0,0 +1,20 @@
>+--- lib/utils/map.c.orig	2015-05-02 14:52:48 UTC
>++++ lib/utils/map.c
>+@@ -22,7 +22,7 @@
>+ #include "map.h"
>+ 
>+ static int
>+-qtcStrMapItemCompare(const void *_left, const void *_right, void *_map)
>++qtcStrMapItemCompare(void *_map, const void *_left, const void *_right)
>+ {
>+     const char **left = (const char**)_left;
>+     const char **right = (const char**)_right;
>+@@ -36,7 +36,7 @@ qtcStrMapInit(QtcStrMap *map)
>+ {
>+     QTC_RET_IF_FAIL(map && !map->inited && map->items && map->size && map->num);
>+     qsort_r(map->items, map->num, map->size,
>+-            qtcStrMapItemCompare, map);
>++            map, qtcStrMapItemCompare);
>+     map->inited = true;
>+ }
>+ 
>Index: x11-themes/qtcurve-utils/files/patch-lib_utils_process.c
>===================================================================
>--- x11-themes/qtcurve-utils/files/patch-lib_utils_process.c	(revision 0)
>+++ x11-themes/qtcurve-utils/files/patch-lib_utils_process.c	(working copy)
>@@ -0,0 +1,17 @@
>+--- lib/utils/process.c.orig	2014-01-25 20:13:54 UTC
>++++ lib/utils/process.c
>+@@ -23,12 +23,13 @@
>+ #include "fd_utils.h"
>+ #include "timer.h"
>+ #include <unistd.h>
>+-#include <wait.h>
>++#include <sys/wait.h>
>+ #include <sys/stat.h>
>+ #include <sys/socket.h>
>+ #include <fcntl.h>
>+ #include <errno.h>
>+ #include <poll.h>
>++#include <signal.h>
>+ 
>+ static bool
>+ qtcSignalHandlerSet(int sig)
>Index: x11-themes/qtcurve-utils/files/patch-qt5_style_qtcurve__api.cpp
>===================================================================
>--- x11-themes/qtcurve-utils/files/patch-qt5_style_qtcurve__api.cpp	(revision 0)
>+++ x11-themes/qtcurve-utils/files/patch-qt5_style_qtcurve__api.cpp	(working copy)
>@@ -0,0 +1,56 @@
>+From: Marco Martin <notmart@gmail.com>
>+Date: Mon, 19 May 2014 08:37:37 +0000
>+Subject: remove qt_filedialog_* api
>+X-Git-Url: http://quickgit.kde.org/?p=qtcurve.git&a=commitdiff&h=323402d8b99502300f65e909c61153cbd5d5d997
>+---
>+remove qt_filedialog_* api
>+
>+it has been removed and doesn't build anymore with recent Qt5 stable
>+branch
>+---
>+
>+
>+--- qt5/style/qtcurve_api.cpp
>++++ qt5/style/qtcurve_api.cpp
>+@@ -67,25 +67,6 @@
>+ 
>+ #include <QDebug>
>+ 
>+-extern QString (*qt_filedialog_existing_directory_hook)(
>+-    QWidget *parent, const QString &caption, const QString &dir,
>+-    QFileDialog::Options options);
>+-
>+-extern QString (*qt_filedialog_open_filename_hook)(
>+-    QWidget *parent, const QString &caption, const QString &dir,
>+-    const QString &filter, QString *selectedFilter,
>+-    QFileDialog::Options options);
>+-
>+-extern QStringList (*qt_filedialog_open_filenames_hook)(
>+-    QWidget * parent, const QString &caption, const QString &dir,
>+-    const QString &filter, QString *selectedFilter,
>+-    QFileDialog::Options options);
>+-
>+-extern QString (*qt_filedialog_save_filename_hook)(
>+-    QWidget *parent, const QString &caption, const QString &dir,
>+-    const QString &filter, QString *selectedFilter,
>+-    QFileDialog::Options options);
>+-
>+ namespace QtCurve {
>+ 
>+ void
>+@@ -161,13 +142,6 @@
>+         if(!qtcIsFlatBgnd(opts.menuBgndAppearance) && 0 == opts.lighterPopupMenuBgnd)
>+             opts.lighterPopupMenuBgnd=1; // shade so that we dont have 3d-ish borders...
>+         opts.menuBgndAppearance = APPEARANCE_FLAT;
>+-    }
>+-
>+-    if (opts.useQtFileDialogApps.contains(appName)) {
>+-        qt_filedialog_existing_directory_hook = 0L;
>+-        qt_filedialog_open_filename_hook = 0L;
>+-        qt_filedialog_open_filenames_hook = 0L;
>+-        qt_filedialog_save_filename_hook = 0L;
>+     }
>+ 
>+     QCommonStyle::polish(app);
>+
>+
>Index: x11-themes/qtcurve-utils/pkg-descr
>===================================================================
>--- x11-themes/qtcurve-utils/pkg-descr	(revision 0)
>+++ x11-themes/qtcurve-utils/pkg-descr	(working copy)
>@@ -0,0 +1,4 @@
>+QtCurve is a set of widget styles for Qt4/KDE4, Qt5 and Gtk2 based apps.
>+This port provides files shared by other QtCurve ports.
>+
>+WWW: https://projects.kde.org/projects/playground/base/qtcurve
>Index: x11-themes/qtcurve-utils/pkg-plist
>===================================================================
>--- x11-themes/qtcurve-utils/pkg-plist	(revision 0)
>+++ x11-themes/qtcurve-utils/pkg-plist	(working copy)
>@@ -0,0 +1,10 @@
>+lib/libqtcurve-utils.so
>+lib/libqtcurve-utils.so.1
>+lib/libqtcurve-utils.so.1.0
>+share/locale/ko/LC_MESSAGES/qtcurve.mo
>+share/locale/ru/LC_MESSAGES/qtcurve.mo
>+share/locale/tr/LC_MESSAGES/qtcurve.mo
>+share/locale/uk/LC_MESSAGES/qtcurve.mo
>+share/locale/zh_CN/LC_MESSAGES/qtcurve.mo
>+share/locale/zh_HK/LC_MESSAGES/qtcurve.mo
>+share/locale/zh_TW/LC_MESSAGES/qtcurve.mo

Actions: View | Diff

Attachments on bug 199871: 156257