Index: head/x11-themes/Makefile =================================================================== --- head/x11-themes/Makefile (revision 464074) +++ head/x11-themes/Makefile (revision 464075) @@ -1,177 +1,178 @@ # $FreeBSD$ # COMMENT = X11 themes SUBDIR += adapta-backgrounds SUBDIR += adapta-gtk-theme SUBDIR += adwaita-common SUBDIR += adwaita-icon-theme SUBDIR += adwaita-qt4 SUBDIR += adwaita-qt5 SUBDIR += arc-gruvbox-theme SUBDIR += audacious-skins SUBDIR += beastie SUBDIR += claws-mail-themes SUBDIR += clearlooks SUBDIR += clearlooks-metacity SUBDIR += clearlooks-phenix-theme SUBDIR += clearlooks-themes SUBDIR += clearlooks-themes-extras SUBDIR += cursor-ardoise-theme SUBDIR += cursor-chameleon-anthracite SUBDIR += cursor-chameleon-darkskyblue SUBDIR += cursor-chameleon-pearl SUBDIR += cursor-chameleon-skyblue SUBDIR += cursor-chameleon-white SUBDIR += cursor-crystal-theme SUBDIR += cursor-dmz-aa-theme SUBDIR += cursor-dmz-theme SUBDIR += cursor-ecliz SUBDIR += cursor-grounation-theme SUBDIR += cursor-jimmac-theme SUBDIR += cursor-neutral-theme SUBDIR += cursor-neutral-white-theme SUBDIR += cursor-polar-theme SUBDIR += e16-themes SUBDIR += emerald-themes SUBDIR += fluxbox-tenr-styles-pack SUBDIR += fvwm-themes SUBDIR += gnome-backgrounds SUBDIR += gnome-icon-theme-symbolic SUBDIR += gnome-icons SUBDIR += gnome-icons-aqua-fusion SUBDIR += gnome-icons-crystal SUBDIR += gnome-icons-dropline-neu SUBDIR += gnome-icons-dropline-nou SUBDIR += gnome-icons-elementary SUBDIR += gnome-icons-faenza SUBDIR += gnome-icons-gentoo-test SUBDIR += gnome-icons-gion SUBDIR += gnome-icons-iris SUBDIR += gnome-icons-jini SUBDIR += gnome-icons-lila SUBDIR += gnome-icons-noia-full SUBDIR += gnome-icons-noia-warm SUBDIR += gnome-icons-refined SUBDIR += gnome-icons-slick SUBDIR += gnome-icons-snow-apple SUBDIR += gnome-icons-stylish SUBDIR += gnome-icons-ximian-south SUBDIR += gnome-themes SUBDIR += gnome-themes-extras SUBDIR += gnome-themes-standard SUBDIR += greybird-theme SUBDIR += gtk-E17-theme SUBDIR += gtk-aluminumalloy-cryogenic-theme SUBDIR += gtk-aluminumalloy-smog-theme SUBDIR += gtk-aluminumalloy-toxic-theme SUBDIR += gtk-aluminumalloy-volcanic-theme SUBDIR += gtk-aquaextremesunken-theme SUBDIR += gtk-arc-themes SUBDIR += gtk-aurora-engine SUBDIR += gtk-blueprint-engine SUBDIR += gtk-cleanice-engine SUBDIR += gtk-digital-cream-theme SUBDIR += gtk-digital-harmony-theme SUBDIR += gtk-engines2 SUBDIR += gtk-envy-theme SUBDIR += gtk-equinox-engine SUBDIR += gtk-gray-theme SUBDIR += gtk-lila-theme SUBDIR += gtk-lila-theme-extras SUBDIR += gtk-longhorninspirat-theme SUBDIR += gtk-milk-theme SUBDIR += gtk-murrina-aqua SUBDIR += gtk-murrina-fancy-clearlooks SUBDIR += gtk-murrina-lightblue SUBDIR += gtk-murrine-engine SUBDIR += gtk-murrine-themes SUBDIR += gtk-nodoka-engine SUBDIR += gtk-oxygen-engine SUBDIR += gtk-qnxtheme SUBDIR += gtk-qt4-engine SUBDIR += gtk-xfce-engine SUBDIR += gtk3-oxygen-engine SUBDIR += gtk3-unico-engine SUBDIR += icon-naming-utils SUBDIR += icons-human-azul SUBDIR += icons-tango SUBDIR += icons-tango-extras SUBDIR += irssi-themes SUBDIR += kde-gtk-config SUBDIR += kde-icons-black-and-white SUBDIR += kde-icons-gartoon-blue-svg SUBDIR += kde-icons-gartoon-svg SUBDIR += kde-icons-graphite-rade8 SUBDIR += kde-icons-kool-gorilla SUBDIR += kde-icons-lime-rade8 SUBDIR += kde-icons-lush SUBDIR += kde-icons-noia SUBDIR += kde-icons-nuovext2 SUBDIR += kde-icons-nuvola SUBDIR += kde-base-artwork-kde4 SUBDIR += kde-wallpapers-kde4 SUBDIR += kde4-style-bespin SUBDIR += kde4-style-nitrogen SUBDIR += kde4-style-oxygen-transparent SUBDIR += kde4-style-polyester SUBDIR += kde4-style-skulpture SUBDIR += kde4-windeco-crystal SUBDIR += kde4-windeco-dekorator SUBDIR += kdeartwork-kde4 SUBDIR += kf5-breeze-icons SUBDIR += kf5-kemoticons SUBDIR += kf5-kiconthemes SUBDIR += kf5-oxygen-icons5 SUBDIR += lumina-themes SUBDIR += lxappearance SUBDIR += lxde-icon-theme SUBDIR += mate-backgrounds SUBDIR += mate-icon-theme SUBDIR += mate-icon-theme-faenza SUBDIR += mate-themes SUBDIR += metacity-aluminumalloy-cryogenic-theme SUBDIR += metacity-aluminumalloy-smog-theme SUBDIR += metacity-aluminumalloy-toxic-theme SUBDIR += metacity-aluminumalloy-volcanic-theme SUBDIR += metacity-aquaextremesunken-theme SUBDIR += metacity-digital-cream-theme SUBDIR += metacity-digital-harmony-theme SUBDIR += metacity-longhorninspirat-theme SUBDIR += metacity-milk-theme SUBDIR += metacity-theme-microgui SUBDIR += metacity-themes SUBDIR += mint-themes SUBDIR += murrine-configurator SUBDIR += nimbus SUBDIR += numix-theme SUBDIR += openbox-arc-theme SUBDIR += openbox-themes SUBDIR += plank-theme-moka SUBDIR += qt4-style-Kvantum SUBDIR += qt4-style-float SUBDIR += qt4-style-phase SUBDIR += qt4-style-quantumstyle SUBDIR += qt5-style-Kvantum SUBDIR += qt5-style-plugins SUBDIR += qtcurve SUBDIR += qtcurve-gtk2 SUBDIR += qtcurve-kde4 + SUBDIR += qtcurve-kf5 SUBDIR += qtcurve-qt4 SUBDIR += qtcurve-qt5 SUBDIR += qtcurve-utils SUBDIR += rezlooks SUBDIR += sawfish-themes SUBDIR += sddm-freebsd-black-theme SUBDIR += slim-freebsd-black-theme SUBDIR += slim-freebsd-themes SUBDIR += slim-themes SUBDIR += thewidgetfactory SUBDIR += ubuntulooks SUBDIR += wallpapers-freebsd-kde4 SUBDIR += xcursor-themes SUBDIR += xfce-evolution SUBDIR += xfce-icons-elementary .include Index: head/x11-themes/qtcurve/Makefile =================================================================== --- head/x11-themes/qtcurve/Makefile (revision 464074) +++ head/x11-themes/qtcurve/Makefile (revision 464075) @@ -1,97 +1,117 @@ # $FreeBSD$ PORTNAME= qtcurve -PORTVERSION= 1.8.18 -PORTREVISION= 4 +DISTVERSION= 1.9.0-rc1 +PORTREVISION?= 0 CATEGORIES= x11-themes MAINTAINER= jhale@FreeBSD.org COMMENT?= Widget styles for Qt and GTK+ toolkits .if !defined(QTCURVE_SLAVE) 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 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} INSTALL_WRKSRC= ${BUILD_WRKSRC} PLIST= ${PKGDIR}/pkg-plist.${QTCURVE_SLAVE} .if ${QTCURVE_SLAVE} == "utils" 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 .if ${QTCURVE_SLAVE} == "gtk2" PKGNAMEPREFIX= gtk2- PKGNAMESUFFIX= -theme -USE_GNOME= gtk20 cairo pango +USE_GNOME= cairo gdkpixbuf2 gtk20 pango USE_LDCONFIG= yes post-install: @(cd ${WRKSRC}/lib/cairo && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) .endif .if ${QTCURVE_SLAVE} == "kde4" 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) .include Index: head/x11-themes/qtcurve/distinfo =================================================================== --- head/x11-themes/qtcurve/distinfo (revision 464074) +++ head/x11-themes/qtcurve/distinfo (revision 464075) @@ -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 Index: head/x11-themes/qtcurve/files/patch-7ddd378 =================================================================== --- head/x11-themes/qtcurve/files/patch-7ddd378 (revision 464074) +++ head/x11-themes/qtcurve/files/patch-7ddd378 (nonexistent) @@ -1,34 +0,0 @@ -From 7ddd3782ea5635cc0d6a6d292824da85ae9d1bb8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ren=C3=A9=20J=2EV=2E=20Bertin?= -Date: Mon, 17 Apr 2017 11:11:31 +0200 -Subject: Make build against Qt 5.9.0 - ---- - qt5/style/qtcurve.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qt5/style/qtcurve.h b/qt5/style/qtcurve.h -index 6930c08..aedcd16 100644 ---- qt5/style/qtcurve.h -+++ qt5/style/qtcurve.h -@@ -379,7 +379,7 @@ private: - void emitMenuSize(QWidget *w, unsigned short size, bool force=false); - void emitStatusBarState(QStatusBar *sb); - const QColor& -- MOArrow(QFlags state, const QPalette &palette, bool mo, -+ MOArrow(State state, const QPalette &palette, bool mo, - QPalette::ColorRole rol) const - { - if (!(state & State_Enabled)) { -@@ -391,7 +391,7 @@ private: - } - } - const QColor& -- MOArrow(QFlags state, const QPalette &palette, -+ MOArrow(State state, const QPalette &palette, - QPalette::ColorRole rol) const - { - return MOArrow(state, palette, state & State_MouseOver, rol); --- -cgit v0.11.2 - Property changes on: head/x11-themes/qtcurve/files/patch-7ddd378 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-themes/qtcurve/files/patch-gtk2_style_qtcurve.c =================================================================== --- head/x11-themes/qtcurve/files/patch-gtk2_style_qtcurve.c (revision 464074) +++ head/x11-themes/qtcurve/files/patch-gtk2_style_qtcurve.c (nonexistent) @@ -1,11 +0,0 @@ ---- gtk2/style/qtcurve.c.orig 2014-01-25 20:13:54 UTC -+++ gtk2/style/qtcurve.c -@@ -372,7 +372,7 @@ gtkDrawFlatBox(GtkStyle *style, GdkWindo - } else if (!(qtSettings.app == GTK_APP_JAVA && widget && - GTK_IS_LABEL(widget))) { - if (state != GTK_STATE_PRELIGHT || opts.crHighlight || -- strcmp(detail, "checkbutton") != 0) { -+ ( detail != NULL && strcmp(detail, "checkbutton") != 0 )) { - parent_class->draw_flat_box(style, window, state, shadow, area, - widget, detail, x, y, width, height); - } Property changes on: head/x11-themes/qtcurve/files/patch-gtk2_style_qtcurve.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-themes/qtcurve/files/patch-lib_utils_fd__utils.c =================================================================== --- head/x11-themes/qtcurve/files/patch-lib_utils_fd__utils.c (revision 464074) +++ head/x11-themes/qtcurve/files/patch-lib_utils_fd__utils.c (nonexistent) @@ -1,10 +0,0 @@ ---- 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 -+#include - #include - - QTC_EXPORT bool Property changes on: head/x11-themes/qtcurve/files/patch-lib_utils_fd__utils.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-themes/qtcurve/files/patch-323402d =================================================================== --- head/x11-themes/qtcurve/files/patch-323402d (revision 464074) +++ head/x11-themes/qtcurve/files/patch-323402d (nonexistent) @@ -1,56 +0,0 @@ -From: Marco Martin -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 - --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); - - Property changes on: head/x11-themes/qtcurve/files/patch-323402d ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-themes/qtcurve/files/patch-bdf0a5c =================================================================== --- head/x11-themes/qtcurve/files/patch-bdf0a5c (revision 464074) +++ head/x11-themes/qtcurve/files/patch-bdf0a5c (nonexistent) @@ -1,22 +0,0 @@ -From: Yichao Yu -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, - - Property changes on: head/x11-themes/qtcurve/files/patch-bdf0a5c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-themes/qtcurve/files/patch-lib_utils_map.c =================================================================== --- head/x11-themes/qtcurve/files/patch-lib_utils_map.c (revision 464074) +++ head/x11-themes/qtcurve/files/patch-lib_utils_map.c (nonexistent) @@ -1,20 +0,0 @@ ---- 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; - } - Property changes on: head/x11-themes/qtcurve/files/patch-lib_utils_map.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-themes/qtcurve/files/patch-lib_utils_process.c =================================================================== --- head/x11-themes/qtcurve/files/patch-lib_utils_process.c (revision 464074) +++ head/x11-themes/qtcurve/files/patch-lib_utils_process.c (nonexistent) @@ -1,12 +0,0 @@ ---- lib/utils/process.c.orig 2014-01-25 20:13:54 UTC -+++ lib/utils/process.c -@@ -23,7 +23,8 @@ - #include "fd_utils.h" - #include "timer.h" - #include --#include -+#include -+#include - #include - #include - #include Property changes on: head/x11-themes/qtcurve/files/patch-lib_utils_process.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-themes/qtcurve/files/patch-lib_utils_CMakeLists.txt =================================================================== --- head/x11-themes/qtcurve/files/patch-lib_utils_CMakeLists.txt (revision 464074) +++ head/x11-themes/qtcurve/files/patch-lib_utils_CMakeLists.txt (revision 464075) @@ -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}") Index: head/x11-themes/qtcurve/files/patch-lib_utils_fd__utils.cpp =================================================================== --- head/x11-themes/qtcurve/files/patch-lib_utils_fd__utils.cpp (nonexistent) +++ head/x11-themes/qtcurve/files/patch-lib_utils_fd__utils.cpp (revision 464075) @@ -0,0 +1,10 @@ +--- 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" + #include ++#include + #include + + QTC_EXPORT bool Property changes on: head/x11-themes/qtcurve/files/patch-lib_utils_fd__utils.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-themes/qtcurve/pkg-descr =================================================================== --- head/x11-themes/qtcurve/pkg-descr (revision 464074) +++ head/x11-themes/qtcurve/pkg-descr (revision 464075) @@ -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 Index: head/x11-themes/qtcurve/pkg-plist.gtk2 =================================================================== --- head/x11-themes/qtcurve/pkg-plist.gtk2 (revision 464074) +++ head/x11-themes/qtcurve/pkg-plist.gtk2 (revision 464075) @@ -1,12 +1,12 @@ 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 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/preferences-rev.xml Index: head/x11-themes/qtcurve/pkg-plist.kf5 =================================================================== --- head/x11-themes/qtcurve/pkg-plist.kf5 (nonexistent) +++ head/x11-themes/qtcurve/pkg-plist.kf5 (revision 464075) @@ -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 Property changes on: head/x11-themes/qtcurve/pkg-plist.kf5 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-themes/qtcurve/pkg-plist.utils =================================================================== --- head/x11-themes/qtcurve/pkg-plist.utils (revision 464074) +++ head/x11-themes/qtcurve/pkg-plist.utils (revision 464075) @@ -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 Index: head/x11-themes/qtcurve-gtk2/Makefile =================================================================== --- head/x11-themes/qtcurve-gtk2/Makefile (revision 464074) +++ head/x11-themes/qtcurve-gtk2/Makefile (revision 464075) @@ -1,12 +1,12 @@ # $FreeBSD$ PORTNAME= qtcurve -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= QtCurve GTK+ 2.x engine and theme QTCURVE_SLAVE= gtk2 MASTERDIR= ${.CURDIR}/../qtcurve .include "${MASTERDIR}/Makefile" Index: head/x11-themes/qtcurve-kde4/Makefile =================================================================== --- head/x11-themes/qtcurve-kde4/Makefile (revision 464074) +++ head/x11-themes/qtcurve-kde4/Makefile (revision 464075) @@ -1,12 +1,12 @@ # $FreeBSD$ PORTNAME= qtcurve -PORTREVISION= 2 +PORTREVISION= 0 COMMENT= QtCurve KDE 4 widget style and window decoration QTCURVE_SLAVE= kde4 MASTERDIR= ${.CURDIR}/../qtcurve .include "${MASTERDIR}/Makefile" Index: head/x11-themes/qtcurve-kf5/Makefile =================================================================== --- head/x11-themes/qtcurve-kf5/Makefile (nonexistent) +++ head/x11-themes/qtcurve-kf5/Makefile (revision 464075) @@ -0,0 +1,12 @@ +# $FreeBSD$ + +PORTNAME= qtcurve +PORTREVISION= 0 + +COMMENT= QtCurve KDE Frameworks 5 widget style and window decoration + +QTCURVE_SLAVE= kf5 + +MASTERDIR= ${.CURDIR}/../qtcurve + +.include "${MASTERDIR}/Makefile" Property changes on: head/x11-themes/qtcurve-kf5/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-themes/qtcurve-qt4/Makefile =================================================================== --- head/x11-themes/qtcurve-qt4/Makefile (revision 464074) +++ head/x11-themes/qtcurve-qt4/Makefile (revision 464075) @@ -1,12 +1,12 @@ # $FreeBSD$ PORTNAME= qtcurve -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= QtCurve widget style for Qt 4 QTCURVE_SLAVE= qt4 MASTERDIR= ${.CURDIR}/../qtcurve .include "${MASTERDIR}/Makefile"