mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
- Add gtk2 and gtk3 flavors to geany ports
- Make gtk3 the default NOTE: some plugins are gtk2 only, please check UPDATING. PR: 226523 Submitted by: Greg V <greg@unrelenting.technology> Reviewed by: mat Approved by: portmgr (mat) Differential Revision: https://reviews.freebsd.org/D18018
This commit is contained in:
Guido Falsi
parent
db473da67e
commit
21c7730fc4
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=487062
14 changed files with 157 additions and 34 deletions
24
UPDATING
24
UPDATING
|
|
@ -5,6 +5,30 @@ they are unavoidable.
|
|||
You should get into the habit of checking this file for changes each time
|
||||
you update your ports collection, before attempting any port upgrades.
|
||||
|
||||
20181209
|
||||
AFFECTS: users of devel/geany and devel/geany-plugins
|
||||
AUTHOR: madpilot@FreeBSD.org
|
||||
|
||||
Geany and it's plugins port have been moved to gtk3 and a new gtk2
|
||||
flavor has been added. The gtk2 flavor has a -gtk2 suffix added to the
|
||||
package name.
|
||||
|
||||
If you want to stay with the gtk2 version you need to use "pkg install"
|
||||
to install the new gtk2 flavor, pkg will automatically deinstall the
|
||||
gtk3 flavors.
|
||||
|
||||
If using port, to maintain the gtk2 version, you will need to deinstall
|
||||
geany and it's plugins and reinstall specifying the gtk2 flavor.
|
||||
|
||||
Note that the following plugins are not available if using the new
|
||||
gtk3 flavor:
|
||||
|
||||
* geany-plugin-debugger
|
||||
* geany-plugin-devhelp
|
||||
* geany-plugin-geanypy
|
||||
* geany-plugin-multiterm
|
||||
* geany-plugin-scope
|
||||
|
||||
20181208:
|
||||
AFFECTS: users of misc/openhab2
|
||||
AUTHOR: netchild@FreeBSD.org
|
||||
|
|
|
|||
|
|
@ -2,11 +2,17 @@
|
|||
|
||||
PORTNAME= geany-plugin-debugger
|
||||
PORTVERSION= ${GEANY_VER}
|
||||
PKGNAMESUFFIX= -gtk2
|
||||
CATEGORIES= devel
|
||||
|
||||
MAINTAINER= madpilot@FreeBSD.org
|
||||
COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC}
|
||||
|
||||
LIB_DEPENDS= libgeany.so:devel/geany@gtk2
|
||||
|
||||
FLAVORS= # intentionally left empty
|
||||
|
||||
USES= gnome
|
||||
USE_GNOME= vte
|
||||
USE_XORG= x11 xext
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
PORTNAME= geany-plugin-devhelp
|
||||
PORTVERSION= ${GEANY_VER}
|
||||
PKGNAMESUFFIX= -gtk2
|
||||
CATEGORIES= devel
|
||||
|
||||
MAINTAINER= madpilot@FreeBSD.org
|
||||
|
|
@ -9,7 +10,10 @@ COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC}
|
|||
|
||||
LIB_DEPENDS= libwnck-1.so:x11-toolkits/libwnck \
|
||||
libwebkitgtk-1.0.so:www/webkit-gtk2 \
|
||||
libsoup-2.4.so:devel/libsoup
|
||||
libsoup-2.4.so:devel/libsoup \
|
||||
libgeany.so:devel/geany@gtk2
|
||||
|
||||
FLAVORS= # intentionally left empty
|
||||
|
||||
USE_GNOME= gconf2
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,16 @@
|
|||
|
||||
PORTNAME= geany-plugin-geanypy
|
||||
PORTVERSION= ${GEANY_VER}
|
||||
PKGNAMESUFFIX= -gtk2
|
||||
CATEGORIES= devel
|
||||
|
||||
MAINTAINER= madpilot@FreeBSD.org
|
||||
COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC}
|
||||
|
||||
LIB_DEPENDS= libgeany.so:devel/geany@gtk2
|
||||
|
||||
FLAVORS= # intentionally left empty
|
||||
|
||||
USES= python:2.7
|
||||
USE_GNOME= pygtk2
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,10 @@ CATEGORIES= devel
|
|||
MAINTAINER= madpilot@FreeBSD.org
|
||||
COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC}
|
||||
|
||||
LIB_DEPENDS= libwebkitgtk-1.0.so:www/webkit-gtk2 \
|
||||
libsoup-2.4.so:devel/libsoup
|
||||
LIB_DEPENDS= libsoup-2.4.so:devel/libsoup
|
||||
|
||||
gtk2_LIB_DEPENDS= libwebkitgtk-1.0.so:www/webkit-gtk2
|
||||
gtk3_LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3
|
||||
|
||||
OPTIONS_DEFINE= DOCS
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,17 @@
|
|||
|
||||
PORTNAME= geany-plugin-multiterm
|
||||
PORTVERSION= ${GEANY_VER}
|
||||
PKGNAMESUFFIX= -gtk2
|
||||
CATEGORIES= devel
|
||||
|
||||
MAINTAINER= madpilot@FreeBSD.org
|
||||
COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC}
|
||||
|
||||
BUILD_DEPENDS= valac:lang/vala
|
||||
LIB_DEPENDS= libgeany.so:devel/geany@gtk2
|
||||
|
||||
FLAVORS= # intentionally left empty
|
||||
|
||||
USE_GNOME= vte
|
||||
USE_XORG= x11 xext
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,16 @@
|
|||
|
||||
PORTNAME= geany-plugin-scope
|
||||
PORTVERSION= ${GEANY_VER}
|
||||
PKGNAMESUFFIX= -gtk2
|
||||
CATEGORIES= devel
|
||||
|
||||
MAINTAINER= madpilot@FreeBSD.org
|
||||
COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC}
|
||||
|
||||
LIB_DEPENDS= libgeany.so:devel/geany@gtk2
|
||||
|
||||
FLAVORS= # intentionally left empty
|
||||
|
||||
USE_GNOME= vte
|
||||
USE_XORG= x11 xext
|
||||
|
||||
|
|
|
|||
|
|
@ -7,11 +7,13 @@ CATEGORIES= devel
|
|||
MAINTAINER= madpilot@FreeBSD.org
|
||||
COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC}
|
||||
|
||||
gtk2_LIB_DEPENDS= libgtkspell.so:textproc/gtkspell
|
||||
gtk3_LIB_DEPENDS= libgtkspell3-3.so:textproc/gtkspell3
|
||||
|
||||
OPTIONS_DEFINE= GTKSPELL
|
||||
OPTIONS_DEFAULT= GTKSPELL
|
||||
|
||||
GTKSPELL_DESC= Spell checking support via GtkSpell
|
||||
GTKSPELL_LIB_DEPENDS= libgtkspell.so:textproc/gtkspell
|
||||
GTKSPELL_CONFIGURE_ENABLE= gtkspell
|
||||
|
||||
.include "${.CURDIR}/../geany-plugins/files/Makefile.common"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,10 @@ CATEGORIES= devel
|
|||
MAINTAINER= madpilot@FreeBSD.org
|
||||
COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC}
|
||||
|
||||
LIB_DEPENDS= libwebkitgtk-1.0.so:www/webkit-gtk2 \
|
||||
libsoup-2.4.so:devel/libsoup
|
||||
LIB_DEPENDS= libsoup-2.4.so:devel/libsoup
|
||||
|
||||
gtk2_LIB_DEPENDS= libwebkitgtk-1.0.so:www/webkit-gtk2
|
||||
gtk3_LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3
|
||||
|
||||
.include "${.CURDIR}/../geany-plugins/files/Makefile.common"
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -3,25 +3,52 @@
|
|||
|
||||
PORTNAME= geany-plugins
|
||||
PORTVERSION= ${GEANY_VER}
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= devel
|
||||
DISTFILES= # none
|
||||
|
||||
MAINTAINER= madpilot@FreeBSD.org
|
||||
COMMENT= Geany plugins (meta port)
|
||||
|
||||
FLAVORS= gtk3 gtk2
|
||||
FLAVOR?= ${FLAVORS:[1]}
|
||||
|
||||
gtk2_CONFLICTS_INSTALL= geany-plugins
|
||||
gtk2_PKGNAMESUFFIX= -gtk2
|
||||
|
||||
gtk3_CONFLICTS_INSTALL= geany-plugins-gtk2
|
||||
|
||||
USES= metaport
|
||||
|
||||
OPTIONS_DEFINE= NLS ${GEANY_PLUGINS_ALL:tu}
|
||||
OPTIONS_DEFAULT= ${GEANY_PLUGINS_ALL:tu}
|
||||
OPTIONS_DEFINE= NLS
|
||||
OPTIONS_GROUP= GTK2 ALL
|
||||
OPTIONS_GROUP_GTK2= ${GEANY_PLUGINS_GTK2:tu}
|
||||
OPTIONS_GROUP_ALL= ${GEANY_PLUGINS_ALL:tu}
|
||||
OPTIONS_DEFAULT= ${GEANY_PLUGINS_ALL:tu} ${GEANY_PLUGINS_GTK2:tu}
|
||||
NO_OPTIONS_SORT= yes
|
||||
|
||||
GTK2_DESC= Available only for GTK2
|
||||
ALL_DESC= Available for both GTK2 and GTK3
|
||||
|
||||
.include "${.CURDIR}/files/bsd.geany-plugins.mk"
|
||||
|
||||
.for plugin in ${GEANY_PLUGINS_ALL}
|
||||
.for plugin in ${GEANY_PLUGINS_ALL} ${GEANY_PLUGINS_GTK2}
|
||||
${plugin:tu}_DESC= ${${plugin}_DESC}
|
||||
${plugin:tu}_RUN_DEPENDS= geany-plugin-${plugin}>=0:devel/geany-plugin-${plugin}
|
||||
.endfor
|
||||
|
||||
NLS_RUN_DEPENDS= geany-plugins-l10n>=0:devel/geany-plugins-l10n
|
||||
.if ${FLAVOR} == gtk2
|
||||
.for plugin in ${GEANY_PLUGINS_ALL}
|
||||
${plugin:tu}_RUN_DEPENDS= geany-plugin-${plugin}-gtk2>=0:devel/geany-plugin-${plugin}@gtk2
|
||||
.endfor
|
||||
.for plugin in ${GEANY_PLUGINS_GTK2}
|
||||
${plugin:tu}_RUN_DEPENDS= geany-plugin-${plugin}-gtk2>=0:devel/geany-plugin-${plugin}
|
||||
.endfor
|
||||
NLS_RUN_DEPENDS= geany-plugins-l10n-gtk2>=0:devel/geany-plugins-l10n@gtk2
|
||||
.elif ${FLAVOR} == gtk3
|
||||
.for plugin in ${GEANY_PLUGINS_ALL}
|
||||
${plugin:tu}_RUN_DEPENDS= geany-plugin-${plugin}>=0:devel/geany-plugin-${plugin}@gtk3
|
||||
.endfor
|
||||
NLS_RUN_DEPENDS= geany-plugins-l10n>=0:devel/geany-plugins-l10n@gtk3
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -2,18 +2,25 @@
|
|||
|
||||
.include "${.CURDIR}/../../devel/geany-plugins/files/bsd.geany-plugins.mk"
|
||||
|
||||
PORTREVISION= 1
|
||||
|
||||
MASTER_SITES= http://plugins.geany.org/geany-plugins/
|
||||
DISTNAME= geany-plugins-${PORTVERSION}
|
||||
DISTINFO_FILE= ${.CURDIR}/../../devel/geany-plugins/distinfo
|
||||
|
||||
BUILD_DEPENDS+= ${LOCALBASE}/bin/geany:devel/geany
|
||||
LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig \
|
||||
libfreetype.so:print/freetype2
|
||||
RUN_DEPENDS+= ${LOCALBASE}/bin/geany:devel/geany
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USES+= gettext-tools gmake libtool pkgconfig tar:bzip2
|
||||
USE_GNOME+= cairo gdkpixbuf2 gtk20 intltool
|
||||
USES+= gettext-tools gmake gnome libtool pkgconfig tar:bzip2
|
||||
USE_GNOME+= intltool
|
||||
|
||||
FLAVORS?= gtk3 gtk2
|
||||
FLAVOR?= ${FLAVORS:[1]}
|
||||
|
||||
gtk2_CONFLICTS_INSTALL= geany-plugin-${GEANY_PLUGIN}
|
||||
gtk2_PKGNAMESUFFIX= -gtk2
|
||||
gtk2_LIB_DEPENDS+= libgeany.so:devel/geany@gtk2
|
||||
|
||||
gtk3_CONFLICTS_INSTALL= geany-plugin-${GEANY_PLUGIN}-gtk2
|
||||
gtk3_LIB_DEPENDS+= libgeany.so:devel/geany@gtk3
|
||||
|
||||
# geany-plugins-l10n is not a plugin, thus special treatment
|
||||
.if ${PORTNAME} == "geany-plugins-l10n"
|
||||
|
|
@ -22,6 +29,17 @@ po_SWITCH= --enable-nls
|
|||
USES+= localbase
|
||||
.else
|
||||
INSTALL_TARGET= install-strip
|
||||
USE_GNOME+= cairo gdkpixbuf2
|
||||
|
||||
.if ${FLAVOR} == gtk3
|
||||
CONFIGURE_ARGS+= --enable-gtk3
|
||||
USE_GNOME+= gtk30
|
||||
.else
|
||||
LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig \
|
||||
libfreetype.so:print/freetype2
|
||||
CONFIGURE_ARGS+= --disable-gtk3
|
||||
USE_GNOME+= gtk20
|
||||
.endif
|
||||
.endif
|
||||
|
||||
GEANY_PLUGIN?= ${PORTNAME:S,geany-plugin-,,}
|
||||
|
|
@ -38,8 +56,9 @@ DOCSDIR= share/doc/geany-plugins
|
|||
|
||||
.if ${GEANY_UTIL:M${GEANY_PLUGIN}}
|
||||
|
||||
LIB_DEPENDS+= libgeanypluginutils.so:devel/geany-plugin-utilslib
|
||||
CONFIGURE_ARGS+=--enable-utilslib
|
||||
gtk2_LIB_DEPENDS+= libgeanypluginutils.so:devel/geany-plugin-utilslib@gtk2
|
||||
gtk3_LIB_DEPENDS+= libgeanypluginutils.so:devel/geany-plugin-utilslib@gtk3
|
||||
CONFIGURE_ARGS+= --enable-utilslib
|
||||
|
||||
pre-build:
|
||||
(cd ${WRKSRC}/utils; ${DO_MAKE_BUILD} ${ALL_TARGET})
|
||||
|
|
|
|||
|
|
@ -1,18 +1,21 @@
|
|||
# $FreeBSD$
|
||||
|
||||
GEANY_VER= 1.33
|
||||
GEANY_PLUGINS_GTK2= debugger \
|
||||
devhelp \
|
||||
geanypy \
|
||||
multiterm \
|
||||
scope
|
||||
|
||||
GEANY_PLUGINS_ALL= addons \
|
||||
autoclose \
|
||||
automark \
|
||||
codenav \
|
||||
commander \
|
||||
ctags \
|
||||
debugger \
|
||||
defineformat \
|
||||
devhelp \
|
||||
doc \
|
||||
extrasel \
|
||||
geanypy \
|
||||
gendoc \
|
||||
geniuspaste \
|
||||
git-changebar \
|
||||
|
|
@ -24,7 +27,6 @@ GEANY_PLUGINS_ALL= addons \
|
|||
macro \
|
||||
markdown \
|
||||
miniscript \
|
||||
multiterm \
|
||||
numberedbookmarks \
|
||||
overview \
|
||||
pairtaghighlighter \
|
||||
|
|
@ -33,7 +35,6 @@ GEANY_PLUGINS_ALL= addons \
|
|||
pretty-printer \
|
||||
projectorganizer \
|
||||
prj \
|
||||
scope \
|
||||
sendmail \
|
||||
shiftcolumn \
|
||||
spellcheck \
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= geany
|
||||
PORTVERSION= 1.33
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= devel editors
|
||||
MASTER_SITES= http://download.geany.org/ SF
|
||||
|
||||
|
|
@ -13,15 +13,23 @@ COMMENT= Fast and lightweight GTK+ IDE
|
|||
LICENSE= GPLv2+
|
||||
LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
|
||||
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
|
||||
libfreetype.so:print/freetype2
|
||||
FLAVORS= gtk3 gtk2
|
||||
FLAVOR?= ${FLAVORS:[1]}
|
||||
|
||||
gtk2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
|
||||
libfreetype.so:print/freetype2
|
||||
gtk2_CONFLICTS_INSTALL= geany
|
||||
gtk2_PKGNAMESUFFIX= -gtk2
|
||||
|
||||
gtk3_CONFLICTS_INSTALL= geany-gtk2
|
||||
|
||||
USES= compiler:c++11-lang desktop-file-utils gettext-tools gmake \
|
||||
gnome libtool localbase pathfix pkgconfig tar:bzip2
|
||||
USE_GNOME= cairo intltool
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
USES= compiler:c++11-lang desktop-file-utils gettext-tools gmake libtool \
|
||||
localbase pathfix pkgconfig tar:bzip2
|
||||
GNU_CONFIGURE= yes
|
||||
INSTALLS_ICONS= yes
|
||||
USE_GNOME= cairo gtk20 intltool
|
||||
USE_LDCONFIG= yes
|
||||
INSTALL_TARGET= install-strip
|
||||
|
||||
OPTIONS_DEFINE= VTE NLS DOCS
|
||||
|
|
@ -35,6 +43,16 @@ VTE_DESC= Embedded virtual terminal
|
|||
VTE_CONFIGURE_ENABLE= vte
|
||||
VTE_USE= GNOME=vte
|
||||
|
||||
.if ${FLAVOR} == gtk2
|
||||
USE_GNOME+= gtk20
|
||||
CONFIGURE_ARGS+= --disable-gtk3
|
||||
PLIST_SUB+= GTK2="" GTK3="@comment "
|
||||
.elif ${FLAVOR} == gtk3
|
||||
USE_GNOME+= gtk30
|
||||
CONFIGURE_ARGS+= --enable-gtk3
|
||||
PLIST_SUB+= GTK2="@comment " GTK3=""
|
||||
.endif
|
||||
|
||||
post-patch-DOCS-off:
|
||||
@${REINPLACE_CMD} -e '/^SUBDIRS/ s|doc||' ${WRKSRC}/Makefile.in
|
||||
|
||||
|
|
|
|||
|
|
@ -153,8 +153,11 @@ share/applications/geany.desktop
|
|||
%%DATADIR%%/filedefs/filetypes.xml
|
||||
%%DATADIR%%/filedefs/filetypes.yaml
|
||||
%%DATADIR%%/filedefs/filetypes.zephir
|
||||
%%GTK3%%%%DATADIR%%/geany-3.0.css
|
||||
%%GTK3%%%%DATADIR%%/geany-3.20.css
|
||||
%%GTK3%%%%DATADIR%%/geany.css
|
||||
%%DATADIR%%/geany.glade
|
||||
%%DATADIR%%/geany.gtkrc
|
||||
%%GTK2%%%%DATADIR%%/geany.gtkrc
|
||||
%%DATADIR%%/snippets.conf
|
||||
%%DATADIR%%/tags/entities.html.tags
|
||||
%%DATADIR%%/tags/std.pas.tags
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue