From owner-svn-ports-all@freebsd.org Sat Sep 5 19:33:17 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7BEF23D3E7D; Sat, 5 Sep 2020 19:33:17 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BkPpj2jdHz3XwH; Sat, 5 Sep 2020 19:33:17 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4106522E03; Sat, 5 Sep 2020 19:33:17 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 085JXH3O034153; Sat, 5 Sep 2020 19:33:17 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 085JXGWc034151; Sat, 5 Sep 2020 19:33:16 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202009051933.085JXGWc034151@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sat, 5 Sep 2020 19:33:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547673 - head/graphics/gmic-qt X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: head/graphics/gmic-qt X-SVN-Commit-Revision: 547673 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 19:33:17 -0000 Author: yuri Date: Sat Sep 5 19:33:16 2020 New Revision: 547673 URL: https://svnweb.freebsd.org/changeset/ports/547673 Log: graphics/gmic-qt: Flavorize the port to support all 3 variants: "gimp", "krita", standalone PR: 244162 Approved by: kde Differential Revision: D23994 Deleted: head/graphics/gmic-qt/pkg-plist Modified: head/graphics/gmic-qt/Makefile head/graphics/gmic-qt/distinfo Modified: head/graphics/gmic-qt/Makefile ============================================================================== --- head/graphics/gmic-qt/Makefile Sat Sep 5 19:27:38 2020 (r547672) +++ head/graphics/gmic-qt/Makefile Sat Sep 5 19:33:16 2020 (r547673) @@ -3,7 +3,7 @@ PORTNAME= gmic-qt DISTVERSIONPREFIX= v. DISTVERSION= 2.3.6 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= graphics kde MASTER_SITES= http://gmic.eu/:stdlib \ @@ -12,6 +12,9 @@ DISTFILES= gmic_stdlib.h:stdlib DIST_SUBDIR= KDE/${PORTNAME}/${PORTVERSION} EXTRACT_ONLY= ${DISTNAME}.tar.gz ${DISTFILE_gmic} ${DISTFILE_cimg} +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES= 64cdd2cdd416ec43171753eddf55a7b3fda0d33b.patch:-p1 # Remove translation files install directive + MAINTAINER= kde@FreeBSD.org COMMENT= Versatile Qt front-end to GMIC @@ -22,6 +25,11 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libfftw3.so:math/fftw3 \ libpng.so:graphics/png +FLAVORS= none krita gimp # reflect the value of GMIC_QT_HOST for simplicity +FLAVOR?= ${FLAVORS:[1]} +krita_PKGNAMESUFFIX= -krita +gimp_PKGNAMESUFFIX= -gimp + USES= cmake compiler:c++14-lang pkgconfig qt:5 xorg USE_QT= core gui network widgets \ buildtools_build linguisttools_build qmake_build @@ -34,19 +42,28 @@ GH_TUPLE= dtschump:gmic:${DISTVERSIONFULL}:gmic/gmic \ # Use the extracted cimg/gmic & Co, as we do not want to depend on graphics/gimp # which would get pulled in by graphics/cimg. -CMAKE_ARGS= -DGMIC_QT_HOST:STRING="krita" \ +CMAKE_ARGS= -DGMIC_QT_HOST:STRING="${FLAVOR}" \ -DGMIC_PATH:STRING="${WRKSRC_gmic}/src" +PLIST_FILES= bin/gmic_${FLAVOR:S/$/_/:S/none_//}qt + PORTSCOUT= limit:[0-9]\..* +.if ${FLAVOR} == gimp +LIB_DEPENDS+= libbabl-0.1.so:x11/babl \ + libgegl-0.4.so:graphics/gegl \ + libgimp-2.0.so:graphics/gimp-app \ + libjson-glib-1.0.so:devel/json-glib +USES+= gettext-runtime gnome +USE_GNOME= cairo gdkpixbuf2 glib20 +.endif + pre-configure: # Copy the necessary files ${CP} ${WRKSRC_cimg}/CImg.h ${WRKSRC_gmic}/src ${CP} ${DISTDIR}/${DIST_SUBDIR}/gmic_stdlib.h ${WRKSRC_gmic}/src do-install: - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/gmic_krita_qt ${STAGEDIR}${PREFIX}/bin - ${MKDIR} ${STAGEDIR}${DATADIR}/translations - ${INSTALL_DATA} ${BUILD_WRKSRC}/*.qm ${STAGEDIR}${DATADIR}/translations + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/gmic_${FLAVOR:S/$/_/:S/none_//}qt ${STAGEDIR}${PREFIX}/bin .include Modified: head/graphics/gmic-qt/distinfo ============================================================================== --- head/graphics/gmic-qt/distinfo Sat Sep 5 19:27:38 2020 (r547672) +++ head/graphics/gmic-qt/distinfo Sat Sep 5 19:33:16 2020 (r547673) @@ -1,9 +1,11 @@ -TIMESTAMP = 1536000081 -SHA256 (KDE/gmic-qt/2.3.6/gmic_stdlib.h) = ea56a438d6a2110526f05a0af1e6ee1dc2206bf1cc6da5c73192f1719b5d5269 -SIZE (KDE/gmic-qt/2.3.6/gmic_stdlib.h) = 1883290 +TIMESTAMP = 1599330680 +SHA256 (KDE/gmic-qt/2.3.6/gmic_stdlib.h) = bd03c763238a053301597a51abc418601c496bf43da7517eeea3445555b70a68 +SIZE (KDE/gmic-qt/2.3.6/gmic_stdlib.h) = 2482755 SHA256 (KDE/gmic-qt/2.3.6/c-koi-gmic-qt-v.2.3.6_GH0.tar.gz) = 51bc054ea9029bd79a3ba1919b535ec9135fe2013b77a73bf92ccd7a07ae9179 SIZE (KDE/gmic-qt/2.3.6/c-koi-gmic-qt-v.2.3.6_GH0.tar.gz) = 538479 SHA256 (KDE/gmic-qt/2.3.6/dtschump-gmic-v.2.3.6_GH0.tar.gz) = 2a9e0859f4d6900b22b00a82a396dd0b344cae4cda2d18ee9cd1566e952216f3 SIZE (KDE/gmic-qt/2.3.6/dtschump-gmic-v.2.3.6_GH0.tar.gz) = 39078483 SHA256 (KDE/gmic-qt/2.3.6/dtschump-CImg-v.2.3.6_GH0.tar.gz) = a3844afda0c701dbf77505f3f8ec6eea4599d3c6485794a5dbf3545444ec8234 SIZE (KDE/gmic-qt/2.3.6/dtschump-CImg-v.2.3.6_GH0.tar.gz) = 11036209 +SHA256 (KDE/gmic-qt/2.3.6/64cdd2cdd416ec43171753eddf55a7b3fda0d33b.patch) = 656494c72f5a2b380a637070eacc1924bc372db5bd0ab25892a835a941ed389e +SIZE (KDE/gmic-qt/2.3.6/64cdd2cdd416ec43171753eddf55a7b3fda0d33b.patch) = 692