kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

deskutils/shutter:

Browse source 
- Unbreak by updating to 0.94.3
- CVE-2015-0854 was fixed upstream, so remove stale patch
- while here, arrange Makefile: utilize options helpers, sort variables, etc

PR:		243072
Submitted by:	ktullavik@gmail.com
Approved by:	maintainer timeout (3 months)
This commit is contained in:
Max Brazhnikov 2020-03-27 12:10:28 +00:00
parent 3e1e618952
commit 3835a289e0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=529241
4 changed files with 18 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
deskutils/shutter/Makefile
View file

@ -2,16 +2,13 @@
# $FreeBSD$
PORTNAME= shutter
PORTVERSION= 0.93.1
PORTREVISION= 5
PORTVERSION= 0.94.3
CATEGORIES= deskutils
MASTER_SITES= http://shutter-project.org/wp-content/uploads/releases/tars/
MASTER_SITES= https://launchpadlibrarian.net/427931700/
MAINTAINER= nivit@FreeBSD.org
COMMENT= Screenshot tool
BROKEN= unfetchable
LICENSE= GPLv3 GPLv2 # the latter for some shipped cursors
LICENSE_COMB= multi
@ -28,7 +25,7 @@ RUN_DEPENDS= ImageMagick6>=6.9.3.1,1:graphics/ImageMagick6 \
p5-Gtk2-ImageView>=0.05:x11-toolkits/p5-Gtk2-ImageView \
p5-Gtk2-Unique>=0.05:x11-toolkits/p5-Gtk2-Unique \
p5-Gtk2>=1.2491:x11-toolkits/p5-Gtk2 \
p5-JSON-XS>=3.01:converters/p5-JSON-XS \
p5-JSON-MaybeXS>=1.0:converters/p5-JSON-MaybeXS \
p5-JSON>=2.90:converters/p5-JSON \
p5-Locale-gettext>=1.05:devel/p5-Locale-gettext \
p5-Net-DBus>=1.0.0:devel/p5-Net-DBus \
@ -43,23 +40,20 @@ RUN_DEPENDS= ImageMagick6>=6.9.3.1,1:graphics/ImageMagick6 \
p5-XML-Simple>=2.20:textproc/p5-XML-Simple \
xdg-utils>=1.0.2.20130919:devel/xdg-utils
USES= desktop-file-utils gettext-runtime gnome perl5 shebangfix
USE_PERL5= run
INSTALLS_ICONS= yes
METADATA_DESC= Enable Shutter to write Metadata
METADATA_RUN_DEPENDS= p5-Image-ExifTool>=9.76:graphics/p5-Image-ExifTool
NO_BUILD= yes
OPTIONS_DEFINE= METADATA NLS
OPTIONS_SUB= yes
SHEBANG_FILES= bin/shutter share/shutter/resources/system/upload_plugins/*.pm
SHUTTER_DESKTOP= share/applications/shutter.desktop
USE_PERL5= run
USES= desktop-file-utils gettext-runtime gnome perl5 shebangfix
OPTIONS_DEFINE= METADATA NLS
OPTIONS_SUB= yes
.include <bsd.port.options.mk>
METADATA_DESC= Enable Shutter to write Metadata
METADATA_RUN_DEPENDS= p5-Image-ExifTool>=9.76:graphics/p5-Image-ExifTool
post-patch:
${REINPLACE_CMD} -e '/OnlyShowIn/d' ${WRKSRC}/${SHUTTER_DESKTOP}
@ -71,11 +65,11 @@ do-install:
${INSTALL_MAN} share/man/man1/shutter.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/)
@(cd ${WRKSRC}/share && \
${COPYTREE_SHARE} "icons pixmaps" ${STAGEDIR}${LOCALBASE}/share)
.if ${PORT_OPTIONS:MNLS}
@(cd ${WRKSRC}/share/locale && \
${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/locale)
.endif
@(cd ${WRKSRC}/share/shutter && \
${COPYTREE_SHARE} resources ${STAGEDIR}${DATADIR})
do-install-NLS-on:
@(cd ${WRKSRC}/share/locale && \
${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/locale)
.include <bsd.port.mk>

5
deskutils/shutter/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (shutter-0.93.1.tar.gz) = 536d1f7bc69fff518bf5a6a040d6a2d65beb2eecd5429967c71c25cf991e9625
SIZE (shutter-0.93.1.tar.gz) = 3432204
TIMESTAMP = 1578014940
SHA256 (shutter-0.94.3.tar.gz) = 85befa3e79042e33b1908635f7b922d3dd2e6fbb3418a275160a3bfccd2c9b07
SIZE (shutter-0.94.3.tar.gz) = 3375447

12
deskutils/shutter/files/patch-CVE-2015-0854
View file

@ -1,12 +0,0 @@
--- share/shutter/resources/modules/Shutter/App/HelperFunctions.pm.orig 2015-09-17 16:09:58 UTC
+++ share/shutter/resources/modules/Shutter/App/HelperFunctions.pm
@@ -53,7 +53,8 @@ sub new {
sub xdg_open {
my ( $self, $dialog, $link, $user_data ) = @_;
- system("xdg-open $link");
+ my @args = ("xdg-open", "$link");
+ system(@args);
if($?){
my $response = $self->{_dialogs}->dlg_error_message(
sprintf( $self->{_d}->get("Error while executing %s."), "'xdg-open'"),

4
deskutils/shutter/pkg-plist
View file

@ -766,10 +766,8 @@ share/pixmaps/shutter.png
%%DATADIR%%/resources/system/plugins/shell/sptrim/sptrim
%%DATADIR%%/resources/system/upload_plugins/Template.pm
%%DATADIR%%/resources/system/upload_plugins/upload/Dropbox.pm
%%DATADIR%%/resources/system/upload_plugins/upload/ITmages.pm
%%DATADIR%%/resources/system/upload_plugins/upload/Gyazo.pm
%%DATADIR%%/resources/system/upload_plugins/upload/Imgur.pm
%%DATADIR%%/resources/system/upload_plugins/upload/Minus.pm
%%DATADIR%%/resources/system/upload_plugins/upload/ToileLibre.pm
%%DATADIR%%/resources/system/upload_plugins/upload/TwitPic.pm
%%DATADIR%%/resources/system/upload_plugins/upload/vgyme.pm
@mode