On Mon Feb 06, 2023 at 09:58:08AM +0000, Klemens Nanni wrote:
> 06.02.2023 06:17, Rafael Sadowski пишет:
> > Update grantlee-qt5 to 5.3.1. All consumers built without issues
> > OK with bump consumers because of the shared lib path change in PLIST?
>
> If in doubt, bump -- can't hurt.
>
> > -lib/grantlee/5.2/
> > -@so lib/grantlee/5.2/grantlee_defaultfilters.so
> > -@so lib/grantlee/5.2/grantlee_defaulttags.so
> > -@so lib/grantlee/5.2/grantlee_i18ntags.so
> > -@so lib/grantlee/5.2/grantlee_loadertags.so
> > +lib/grantlee/5.3/
> > +@so lib/grantlee/5.3/grantlee_defaultfilters.so
> > +@so lib/grantlee/5.3/grantlee_defaulttags.so
> > +@so lib/grantlee/5.3/grantlee_i18ntags.so
> > +@so lib/grantlee/5.3/grantlee_loadertags.so
>
> I think you can put the version string into a variable and then pass it
> SUBST_VARS and/or UPDATE_PLIST_ARGS, so that these lines remain stable.
>
> V_PLIST = ${VERSION:R}
> Not sure what to pass where, though.
>
Good point but it would cost more work for consumers to share V_GRANTLEE.
Index: x11/grantlee-qt5/Makefile
===================================================================
RCS file: /cvs/ports/x11/grantlee-qt5/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- x11/grantlee-qt5/Makefile 28 May 2022 06:20:03 -0000 1.12
+++ x11/grantlee-qt5/Makefile 6 Feb 2023 11:27:02 -0000
@@ -1,16 +1,15 @@
-COMMENT = template and text document library for Qt5
+COMMENT = template and text document library for Qt5
-VERSION = 5.2.0
-PKGNAME = grantlee-qt5-${VERSION}
-DISTNAME = grantlee-${VERSION}
-REVISION = 2
+V = 5.3.1
+PKGNAME = grantlee-qt5-${V}
+DISTNAME = grantlee-${V}
-SHARED_LIBS += Grantlee_Templates 1.0 # 5.1
-SHARED_LIBS += Grantlee_TextDocument 0.0 # 5.1
+SHARED_LIBS += Grantlee_Templates 1.1 # 5.1
+SHARED_LIBS += Grantlee_TextDocument 0.1 # 5.1
-CATEGORIES = devel x11
+CATEGORIES = devel x11
-HOMEPAGE = https://github.com/steveire/grantlee
+HOMEPAGE = https://github.com/steveire/grantlee
# LGPLv2.1
PERMIT_PACKAGE = Yes
@@ -18,21 +17,21 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Network Qt5Qml
WANTLIB += c m
-MASTER_SITES = http://downloads.grantlee.org/ \
- http://www.loegria.net/grantlee/
+MASTER_SITES = https://github.com/steveire/grantlee/releases/download/v${V}/
-MODULES = devel/cmake \
- x11/qt5
+MODULES = devel/cmake \
+ x11/qt5
-LIB_DEPENDS += x11/qt5/qtdeclarative
+LIB_DEPENDS += x11/qt5/qtdeclarative
-TEST_DEPENDS = ${BUILD_PKGPATH}
+TEST_DEPENDS = ${BUILD_PKGPATH}
TEST_IS_INTERACTIVE = X11
+V_GRANTLEE = ${V:R}
+SUBST_VARS += V_GRANTLEE
+
CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON \
-DCMAKE_DISABLE_FIND_PACKAGE_LCov=ON \
-DCMAKE_DISABLE_FIND_PACKAGE_Cccc=ON
-
-MODCMAKE_LDFLAGS = -lc -lpthread
.include <bsd.port.mk>
Index: x11/grantlee-qt5/distinfo
===================================================================
RCS file: /cvs/ports/x11/grantlee-qt5/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- x11/grantlee-qt5/distinfo 31 Aug 2020 19:06:18 -0000 1.2
+++ x11/grantlee-qt5/distinfo 6 Feb 2023 11:27:02 -0000
@@ -1,2 +1,2 @@
-SHA256 (grantlee-5.2.0.tar.gz) = 1s0E3jmgc6eHyauOcqCIjkB3nSG4P7x4ihs20xrGWdU=
-SIZE (grantlee-5.2.0.tar.gz) = 1166467
+SHA256 (grantlee-5.3.1.tar.gz) = uiiK6e037Aw2Is60CuH34eay6okhathYfwhj1kviTwY=
+SIZE (grantlee-5.3.1.tar.gz) = 1176012
Index: x11/grantlee-qt5/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/grantlee-qt5/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- x11/grantlee-qt5/pkg/PLIST 11 Mar 2022 20:16:01 -0000 1.4
+++ x11/grantlee-qt5/pkg/PLIST 6 Feb 2023 11:27:02 -0000
@@ -39,10 +39,10 @@ lib/cmake/Grantlee5/GrantleeMacros.cmake
lib/cmake/Grantlee5/GrantleeTargets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/Grantlee5/GrantleeTargets.cmake
lib/grantlee/
-lib/grantlee/5.2/
-@so lib/grantlee/5.2/grantlee_defaultfilters.so
-@so lib/grantlee/5.2/grantlee_defaulttags.so
-@so lib/grantlee/5.2/grantlee_i18ntags.so
-@so lib/grantlee/5.2/grantlee_loadertags.so
+lib/grantlee/${V_GRANTLEE}/
+@so lib/grantlee/${V_GRANTLEE}/grantlee_defaultfilters.so
+@so lib/grantlee/${V_GRANTLEE}/grantlee_defaulttags.so
+@so lib/grantlee/${V_GRANTLEE}/grantlee_i18ntags.so
+@so lib/grantlee/${V_GRANTLEE}/grantlee_loadertags.so
@lib lib/libGrantlee_Templates.so.${LIBGrantlee_Templates_VERSION}
@lib lib/libGrantlee_TextDocument.so.${LIBGrantlee_TextDocument_VERSION}
Index: x11/kde-applications/grantleetheme/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde-applications/grantleetheme/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- x11/kde-applications/grantleetheme/Makefile 25 Aug 2022 20:13:17 -0000
1.9
+++ x11/kde-applications/grantleetheme/Makefile 6 Feb 2023 11:27:02 -0000
@@ -1,6 +1,7 @@
COMMENT = grantlee theme library
DISTNAME = grantleetheme-${VERSION}
CATEGORIES = devel x11
+REVISION = 0
SHARED_LIBS += KF5GrantleeTheme 2.0 # 5.9
@@ -28,7 +29,7 @@ LIB_DEPENDS = devel/kf5/attica \
devel/kf5/kservice \
devel/kf5/kwidgetsaddons \
devel/kf5/kxmlgui \
- x11/grantlee-qt5>=5.2
+ x11/grantlee-qt5>=5.3
TEST_IS_INTERACTIVE = X11
Index: x11/kde-applications/grantleetheme/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/kde-applications/grantleetheme/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- x11/kde-applications/grantleetheme/pkg/PLIST 18 Dec 2022 09:10:54
-0000 1.10
+++ x11/kde-applications/grantleetheme/pkg/PLIST 6 Feb 2023 11:27:02
-0000
@@ -26,7 +26,7 @@ lib/cmake/KF5GrantleeTheme/KF5GrantleeTh
lib/cmake/KF5GrantleeTheme/KF5GrantleeThemeConfigVersion.cmake
lib/cmake/KF5GrantleeTheme/KF5GrantleeThemeTargets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/KF5GrantleeTheme/KF5GrantleeThemeTargets.cmake
-@so lib/grantlee/5.2/kde_grantlee_plugin.so
+@so lib/grantlee/5.3/kde_grantlee_plugin.so
@lib lib/libKF5GrantleeTheme.so.${LIBKF5GrantleeTheme_VERSION}
share/kf5/mkspecs/qt_GrantleeTheme.pri
share/locale/ar/LC_MESSAGES/libgrantleetheme.mo
Index: x11/kde-applications/kcalutils/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde-applications/kcalutils/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- x11/kde-applications/kcalutils/Makefile 25 Aug 2022 20:13:18 -0000
1.11
+++ x11/kde-applications/kcalutils/Makefile 6 Feb 2023 11:27:02 -0000
@@ -1,6 +1,7 @@
COMMENT = library for the handling of calendar data.
DISTNAME = kcalutils-${VERSION}
CATEGORIES = productivity
+REVISION = 1
SHARED_LIBS += KF5CalendarUtils 3.0 # 5.6
@@ -18,7 +19,7 @@ LIB_DEPENDS += devel/kf5/kcodecs \
devel/kf5/ki18n \
devel/kf5/kiconthemes \
devel/kf5/kwidgetsaddons \
- x11/grantlee-qt5>=5.2 \
+ x11/grantlee-qt5>=5.3 \
x11/kde-applications/kidentitymanagement
TEST_IS_INTERACTIVE = X11
Index: x11/kde-applications/kcalutils/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/kde-applications/kcalutils/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- x11/kde-applications/kcalutils/pkg/PLIST 18 Dec 2022 09:10:57 -0000
1.11
+++ x11/kde-applications/kcalutils/pkg/PLIST 6 Feb 2023 11:27:02 -0000
@@ -24,7 +24,7 @@ lib/cmake/KF5CalendarUtils/KF5CalendarUt
lib/cmake/KF5CalendarUtils/KF5CalendarUtilsConfigVersion.cmake
lib/cmake/KF5CalendarUtils/KF5CalendarUtilsTargets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/KF5CalendarUtils/KF5CalendarUtilsTargets.cmake
-@so lib/grantlee/5.2/kcalendar_grantlee_plugin.so
+@so lib/grantlee/5.3/kcalendar_grantlee_plugin.so
@lib lib/libKF5CalendarUtils.so.${LIBKF5CalendarUtils_VERSION}
share/kf5/mkspecs/qt_KCalUtils.pri
share/locale/ar/LC_MESSAGES/libkcalutils5.mo
Index: devel/kdevelop/Makefile
===================================================================
RCS file: /cvs/ports/devel/kdevelop/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- devel/kdevelop/Makefile 18 Dec 2022 09:10:50 -0000 1.59
+++ devel/kdevelop/Makefile 6 Feb 2023 11:27:04 -0000
@@ -5,6 +5,7 @@ COMMENT = IDE for C, C++, Python, QML/Ja
CATEGORIES = devel x11
DISTNAME = kdevelop-${MODKDE_VERSION}
+REVISION = 0
HOMEPAGE = https://www.kdevelop.org/
@@ -102,7 +103,7 @@ LIB_DEPENDS = devel/kf5/kconfig \
devel/kf5/threadweaver \
devel/llvm \
devel/subversion \
- x11/grantlee-qt5>=5.2 \
+ x11/grantlee-qt5>=5.3 \
x11/kde-applications/libkomparediff2 \
x11/kde-applications/okteta>=0.26.1v0 \
x11/qt5/qtdeclarative \
Index: devel/kdevelop/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/kdevelop/pkg/PLIST,v
retrieving revision 1.34
diff -u -p -r1.34 PLIST
--- devel/kdevelop/pkg/PLIST 13 Jan 2023 10:54:30 -0000 1.34
+++ devel/kdevelop/pkg/PLIST 6 Feb 2023 11:27:04 -0000
@@ -465,8 +465,8 @@ lib/cmake/KDevelop/KDevelopTargets.cmake
@lib lib/libKDevPlatformVcs.so.${LIBKDevPlatformVcs_VERSION}
@so lib/libKDevelopSessionsWatch.so
lib/qt5/plugins/grantlee/
-lib/qt5/plugins/grantlee/5.2/
-@so lib/qt5/plugins/grantlee/5.2/kdev_filters.so
+lib/qt5/plugins/grantlee/5.3/
+@so lib/qt5/plugins/grantlee/5.3/kdev_filters.so
lib/qt5/plugins/kdevplatform/
lib/qt5/plugins/kdevplatform/510/
@so lib/qt5/plugins/kdevplatform/510/kdevandroid.so
