Date: Sat, 10 Mar 2018 14:07:27 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464075 - in head/x11-themes: . qtcurve qtcurve-gtk2 qtcurve-kde4 qtcurve-kf5 qtcurve-qt4 qtcurve/files Message-ID: <201803101407.w2AE7RYB031220@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Sat Mar 10 14:07:27 2018 New Revision: 464075 URL: https://svnweb.freebsd.org/changeset/ports/464075 Log: - Update x11-themes/qtcurve* to 1.9.0-rc1 - Add KDE Frameworks 5 support - Be more specific with dependencies to satisfy stage-qa Changes: https://github.com/KDE/qtcurve/releases/tag/1.9.0-rc1 Added: head/x11-themes/qtcurve-kf5/ - copied from r463855, head/x11-themes/qtcurve-kde4/ head/x11-themes/qtcurve/files/patch-lib_utils_fd__utils.cpp - copied, changed from r464074, head/x11-themes/qtcurve/files/patch-lib_utils_fd__utils.c head/x11-themes/qtcurve/pkg-plist.kf5 (contents, props changed) Deleted: head/x11-themes/qtcurve/files/patch-323402d head/x11-themes/qtcurve/files/patch-7ddd378 head/x11-themes/qtcurve/files/patch-bdf0a5c head/x11-themes/qtcurve/files/patch-gtk2_style_qtcurve.c head/x11-themes/qtcurve/files/patch-lib_utils_fd__utils.c head/x11-themes/qtcurve/files/patch-lib_utils_map.c head/x11-themes/qtcurve/files/patch-lib_utils_process.c Modified: head/x11-themes/Makefile head/x11-themes/qtcurve-gtk2/Makefile head/x11-themes/qtcurve-kde4/Makefile head/x11-themes/qtcurve-kf5/Makefile head/x11-themes/qtcurve-qt4/Makefile head/x11-themes/qtcurve/Makefile head/x11-themes/qtcurve/distinfo head/x11-themes/qtcurve/files/patch-lib_utils_CMakeLists.txt head/x11-themes/qtcurve/pkg-descr head/x11-themes/qtcurve/pkg-plist.gtk2 head/x11-themes/qtcurve/pkg-plist.utils Modified: head/x11-themes/Makefile ============================================================================== --- head/x11-themes/Makefile Sat Mar 10 13:48:14 2018 (r464074) +++ head/x11-themes/Makefile Sat Mar 10 14:07:27 2018 (r464075) @@ -158,6 +158,7 @@ SUBDIR += qtcurve SUBDIR += qtcurve-gtk2 SUBDIR += qtcurve-kde4 + SUBDIR += qtcurve-kf5 SUBDIR += qtcurve-qt4 SUBDIR += qtcurve-qt5 SUBDIR += qtcurve-utils Modified: head/x11-themes/qtcurve-gtk2/Makefile ============================================================================== --- head/x11-themes/qtcurve-gtk2/Makefile Sat Mar 10 13:48:14 2018 (r464074) +++ head/x11-themes/qtcurve-gtk2/Makefile Sat Mar 10 14:07:27 2018 (r464075) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= qtcurve -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= QtCurve GTK+ 2.x engine and theme Modified: head/x11-themes/qtcurve-kde4/Makefile ============================================================================== --- head/x11-themes/qtcurve-kde4/Makefile Sat Mar 10 13:48:14 2018 (r464074) +++ head/x11-themes/qtcurve-kde4/Makefile Sat Mar 10 14:07:27 2018 (r464075) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= qtcurve -PORTREVISION= 2 +PORTREVISION= 0 COMMENT= QtCurve KDE 4 widget style and window decoration Modified: head/x11-themes/qtcurve-kf5/Makefile ============================================================================== --- head/x11-themes/qtcurve-kde4/Makefile Thu Mar 8 01:00:05 2018 (r463855) +++ head/x11-themes/qtcurve-kf5/Makefile Sat Mar 10 14:07:27 2018 (r464075) @@ -1,11 +1,11 @@ # $FreeBSD$ PORTNAME= qtcurve -PORTREVISION= 2 +PORTREVISION= 0 -COMMENT= QtCurve KDE 4 widget style and window decoration +COMMENT= QtCurve KDE Frameworks 5 widget style and window decoration -QTCURVE_SLAVE= kde4 +QTCURVE_SLAVE= kf5 MASTERDIR= ${.CURDIR}/../qtcurve Modified: head/x11-themes/qtcurve-qt4/Makefile ============================================================================== --- head/x11-themes/qtcurve-qt4/Makefile Sat Mar 10 13:48:14 2018 (r464074) +++ head/x11-themes/qtcurve-qt4/Makefile Sat Mar 10 14:07:27 2018 (r464075) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= qtcurve -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= QtCurve widget style for Qt 4 Modified: head/x11-themes/qtcurve/Makefile ============================================================================== --- head/x11-themes/qtcurve/Makefile Sat Mar 10 13:48:14 2018 (r464074) +++ head/x11-themes/qtcurve/Makefile Sat Mar 10 14:07:27 2018 (r464075) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= qtcurve -PORTVERSION= 1.8.18 -PORTREVISION= 4 +DISTVERSION= 1.9.0-rc1 +PORTREVISION?= 0 CATEGORIES= x11-themes MAINTAINER= jhale@FreeBSD.org @@ -13,25 +13,30 @@ USES= metaport # There is no NO_PATCH PATCHDIR= ${MASTERDIR}/none -OPTIONS_DEFINE= GTK2 KDE4 QT4 QT5 -OPTIONS_DEFAULT:= ${OPTIONS_DEFINE} +OPTIONS_RADIO= QT5 +OPTIONS_RADIO_QT5= KF5 QT5 +OPTIONS_DEFINE= GTK2 KDE4 QT4 +OPTIONS_DEFAULT= GTK2 KDE4 QT4 QT5 -GTK2_RUN_DEPENDS= gtk2-qtcurve-theme>=1.8.18:x11-themes/qtcurve-gtk2 -KDE4_RUN_DEPENDS= kde4-style-qtcurve>=1.8.18:x11-themes/qtcurve-kde4 -QT4_RUN_DEPENDS= qt4-style-qtcurve>=1.8.18:x11-themes/qtcurve-qt4 -QT5_RUN_DEPENDS= qt5-style-qtcurve>=1.8.18:x11-themes/qtcurve-qt5 +GTK2_RUN_DEPENDS= gtk2-qtcurve-theme>=${PORTVERSION}:x11-themes/qtcurve-gtk2 +KDE4_RUN_DEPENDS= kde4-style-qtcurve>=${PORTVERSION}:x11-themes/qtcurve-kde4 +KF5_DESC= KDE Frameworks 5 + Qt 5 toolkit support +KF5_RUN_DEPENDS= kf5-style-qtcurve>=${PORTVERSION}:x11-themes/qtcurve-kf5 +QT4_RUN_DEPENDS= qt4-style-qtcurve>=${PORTVERSION}:x11-themes/qtcurve-qt4 +QT5_RUN_DEPENDS= qt5-style-qtcurve>=${PORTVERSION}:x11-themes/qtcurve-qt5 .else # !defined(QTCURVE_SLAVE) -LICENSE= LGPL21 +LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING USE_GITHUB= yes -GH_ACCOUNT= QtCurve +GH_ACCOUNT= KDE +GH_TAGNAME= a1ec5f8 USES= compiler:c++11-lib cmake pkgconfig USE_XORG= x11 xcb -.for i in gtk2 kde4 qt4 qt5 +.for i in gtk2 kde4 kf5 qt4 qt5 WITH_${i}= Off .endfor WITH_${QTCURVE_SLAVE}= On @@ -39,7 +44,8 @@ WITH_${QTCURVE_SLAVE}= On CMAKE_ARGS+= -DENABLE_GTK2=${WITH_gtk2} \ -DENABLE_QT4=${WITH_qt4} \ -DENABLE_QT5=${WITH_qt5} \ - -DQTC_QT4_ENABLE_KDE=${WITH_kde4} + -DQTC_QT4_ENABLE_KDE=${WITH_kde4} \ + -DQTC_QT5_ENABLE_KDE=${WITH_kf5} LDFLAGS+= -L${LOCALBASE}/lib BUILD_WRKSRC= ${WRKSRC}/${QTCURVE_SLAVE} @@ -51,11 +57,6 @@ PLIST= ${PKGDIR}/pkg-plist.${QTCURVE_SLAVE} PKGNAMESUFFIX= -utils USE_LDCONFIG= yes BUILD_WRKSRC= ${WRKSRC} - -OPTIONS_DEFINE= NLS -OPTIONS_SUB= yes -NLS_USES= gettext-tools:build -NLS_CMAKE_OFF= -DQTC_INSTALL_PO=Off .else LIB_DEPENDS+= libqtcurve-utils.so:x11-themes/qtcurve-utils .endif @@ -63,7 +64,7 @@ LIB_DEPENDS+= libqtcurve-utils.so:x11-themes/qtcurve-u .if ${QTCURVE_SLAVE} == "gtk2" PKGNAMEPREFIX= gtk2- PKGNAMESUFFIX= -theme -USE_GNOME= gtk20 cairo pango +USE_GNOME= cairo gdkpixbuf2 gtk20 pango USE_LDCONFIG= yes post-install: @@ -76,21 +77,40 @@ WITH_qt4= On # required for KDE 4 PKGNAMEPREFIX= kde4-style- USE_KDE= kdelibs workspace automoc4 USES+= kde:4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT4= corelib dbus gui svg moc_build qmake_build rcc_build uic_build BUILD_WRKSRC= ${WRKSRC}/qt4 .endif +.if ${QTCURVE_SLAVE} == "kf5" +CONFLICTS_INSTALL= qt5-style-qtcurve +WITH_qt5= On # required for KF5 +PKGNAMEPREFIX= kf5-style- +USES+= kde:5 +USE_KDE= archive completion config configwidgets coreaddons \ + ecm_build frameworkintegration guiaddons i18n iconthemes \ + kdelibs4support kio widgetsaddons windowsystem xmlgui +USE_QT5= core dbus gui printsupport svg widgets x11extras \ + buildtools_build qmake_build +BUILD_WRKSRC= ${WRKSRC}/qt5 +.endif + .if ${QTCURVE_SLAVE} == "qt4" PKGNAMEPREFIX= qt4-style- -USE_QT4= dbus gui svg moc_build qmake_build rcc_build uic_build +USE_QT4= corelib dbus gui svg moc_build qmake_build rcc_build uic_build PLIST_FILES= ${QT_PLUGINDIR_REL}/styles/qtcurve.so .endif .if ${QTCURVE_SLAVE} == "qt5" +CONFLICTS_INSTALL= kf5-style-qtcurve PKGNAMEPREFIX= qt5-style- -USE_QT5= dbus gui svg widgets x11extras buildtools_build qmake_build +USE_QT5= core dbus gui svg widgets x11extras \ + buildtools_build qmake_build PLIST_FILES= ${QT_PLUGINDIR_REL}/styles/qtcurve.so .endif + +post-patch: + @${REINPLACE_CMD} -e 's|bash|sh|' -e 's|\[\[|[|g' -e 's|\]\]|]|g' \ + ${WRKSRC}/tools/gen-version.sh .endif # !defined(QTCURVE_SLAVE) Modified: head/x11-themes/qtcurve/distinfo ============================================================================== --- head/x11-themes/qtcurve/distinfo Sat Mar 10 13:48:14 2018 (r464074) +++ head/x11-themes/qtcurve/distinfo Sat Mar 10 14:07:27 2018 (r464075) @@ -1,2 +1,3 @@ -SHA256 (QtCurve-qtcurve-1.8.18_GH0.tar.gz) = 85997c9fa4a948945d719342f5993486aecf189d176408280bad9af8600873a6 -SIZE (QtCurve-qtcurve-1.8.18_GH0.tar.gz) = 991195 +TIMESTAMP = 1520485100 +SHA256 (KDE-qtcurve-1.9.0-rc1-a1ec5f8_GH0.tar.gz) = 1be388cb06f30c9dd4e5685a35ab5d5910619bc644c63e9f5fca75313fb8646d +SIZE (KDE-qtcurve-1.9.0-rc1-a1ec5f8_GH0.tar.gz) = 800796 Modified: head/x11-themes/qtcurve/files/patch-lib_utils_CMakeLists.txt ============================================================================== --- head/x11-themes/qtcurve/files/patch-lib_utils_CMakeLists.txt Sat Mar 10 13:48:14 2018 (r464074) +++ head/x11-themes/qtcurve/files/patch-lib_utils_CMakeLists.txt Sat Mar 10 14:07:27 2018 (r464075) @@ -1,11 +1,11 @@ ---- lib/utils/CMakeLists.txt.orig 2014-01-25 20:13:54 UTC +--- lib/utils/CMakeLists.txt.orig 2017-06-04 19:20:38 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 ${CMAKE_DL_LIBS} ${LIBEXECINFO_LIBRARIES} pthread) +@@ -20,7 +20,7 @@ set(qtcurve_utils_SRCS + set(qtcurve_utils_LINKS ${LIBEXECINFO_LIBRARIES} pthread) - include_directories("${CMAKE_CURRENT_BINARY_DIR}") + if(NOT APPLE) +- set(qtcurve_utils_LINKS ${qtcurve_utils_LINKS} m rt dl) ++ set(qtcurve_utils_LINKS ${qtcurve_utils_LINKS} m rt) + endif() + include_directories("${CMAKE_CURRENT_BINARY_DIR}") Copied and modified: head/x11-themes/qtcurve/files/patch-lib_utils_fd__utils.cpp (from r464074, head/x11-themes/qtcurve/files/patch-lib_utils_fd__utils.c) ============================================================================== --- head/x11-themes/qtcurve/files/patch-lib_utils_fd__utils.c Sat Mar 10 13:48:14 2018 (r464074, copy source) +++ head/x11-themes/qtcurve/files/patch-lib_utils_fd__utils.cpp Sat Mar 10 14:07:27 2018 (r464075) @@ -1,5 +1,5 @@ ---- lib/utils/fd_utils.c.orig 2014-01-25 20:13:54 UTC -+++ lib/utils/fd_utils.c +--- lib/utils/fd_utils.cpp.orig 2014-01-25 20:13:54 UTC ++++ lib/utils/fd_utils.cpp @@ -21,6 +21,7 @@ #include "fd_utils.h" Modified: head/x11-themes/qtcurve/pkg-descr ============================================================================== --- head/x11-themes/qtcurve/pkg-descr Sat Mar 10 13:48:14 2018 (r464074) +++ head/x11-themes/qtcurve/pkg-descr Sat Mar 10 14:07:27 2018 (r464075) @@ -1,3 +1,3 @@ QtCurve is a set of widget styles for Qt and GTK+ toolkits. -WWW: https://projects.kde.org/projects/playground/base/qtcurve +WWW: https://cgit.kde.org/qtcurve.git Modified: head/x11-themes/qtcurve/pkg-plist.gtk2 ============================================================================== --- head/x11-themes/qtcurve/pkg-plist.gtk2 Sat Mar 10 13:48:14 2018 (r464074) +++ head/x11-themes/qtcurve/pkg-plist.gtk2 Sat Mar 10 14:07:27 2018 (r464075) @@ -1,7 +1,7 @@ lib/gtk-2.0/%%GTK2_VERSION%%/engines/libqtcurve.so lib/libqtcurve-cairo.so -lib/libqtcurve-cairo.so.0 -lib/libqtcurve-cairo.so.0.1 +lib/libqtcurve-cairo.so.1 +lib/libqtcurve-cairo.so.1.0 share/themes/QtCurve/gtk-2.0/gtkrc share/themes/QtCurve/gtk-2.0/icons3 share/themes/QtCurve/gtk-2.0/icons4 Added: head/x11-themes/qtcurve/pkg-plist.kf5 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-themes/qtcurve/pkg-plist.kf5 Sat Mar 10 14:07:27 2018 (r464075) @@ -0,0 +1,4 @@ +%%QT_PLUGINDIR%%/kstyle_qtcurve5_config.so +%%QT_PLUGINDIR%%/styles/qtcurve.so +share/kstyle/themes/qtcurve.themerc +share/kxmlgui5/QtCurve/QtCurveui.rc Modified: head/x11-themes/qtcurve/pkg-plist.utils ============================================================================== --- head/x11-themes/qtcurve/pkg-plist.utils Sat Mar 10 13:48:14 2018 (r464074) +++ head/x11-themes/qtcurve/pkg-plist.utils Sat Mar 10 14:07:27 2018 (r464075) @@ -1,10 +1,3 @@ lib/libqtcurve-utils.so -lib/libqtcurve-utils.so.1 -lib/libqtcurve-utils.so.1.0 -%%NLS%%share/locale/ko/LC_MESSAGES/qtcurve.mo -%%NLS%%share/locale/ru/LC_MESSAGES/qtcurve.mo -%%NLS%%share/locale/tr/LC_MESSAGES/qtcurve.mo -%%NLS%%share/locale/uk/LC_MESSAGES/qtcurve.mo -%%NLS%%share/locale/zh_CN/LC_MESSAGES/qtcurve.mo -%%NLS%%share/locale/zh_HK/LC_MESSAGES/qtcurve.mo -%%NLS%%share/locale/zh_TW/LC_MESSAGES/qtcurve.mo +lib/libqtcurve-utils.so.2 +lib/libqtcurve-utils.so.2.0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803101407.w2AE7RYB031220>