diff options
| author | jgh <jgh@FreeBSD.org> | 2018-07-19 04:35:44 +0800 |
|---|---|---|
| committer | jgh <jgh@FreeBSD.org> | 2018-07-19 04:35:44 +0800 |
| commit | b7cefe2cab41b009f9fc1014b1304ac5448b76e6 (patch) | |
| tree | 2df492685151c7e1867778e17faa69d0f25b56a0 /x11/xlockmore | |
| parent | baf80b578b1753f51555b5919df3edf801246ba2 (diff) | |
| download | freebsd-ports-gnome-b7cefe2cab41b009f9fc1014b1304ac5448b76e6.tar.gz freebsd-ports-gnome-b7cefe2cab41b009f9fc1014b1304ac5448b76e6.tar.zst freebsd-ports-gnome-b7cefe2cab41b009f9fc1014b1304ac5448b76e6.zip | |
- update to 5.55
- fix CLANG 6.0.0 compile issue [1]
- address DESTDIR and INSTALL_PROGRAM issues
PR: 225827
Submitted by: tobik@ [1 (patch)]
Reported by: ohartmann@walstatt.org [1]
Diffstat (limited to 'x11/xlockmore')
| -rw-r--r-- | x11/xlockmore/Makefile | 5 | ||||
| -rw-r--r-- | x11/xlockmore/distinfo | 6 | ||||
| -rw-r--r-- | x11/xlockmore/files/patch-xglock_xglock.c | 30 | ||||
| -rw-r--r-- | x11/xlockmore/pkg-plist | 5 |
4 files changed, 41 insertions, 5 deletions
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index 6036582cd613..ca30be50067f 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xlockmore -PORTVERSION= 5.54 -PORTREVISION= 2 +PORTVERSION= 5.55 CATEGORIES?= x11 MASTER_SITES= http://www.sillycycle.com/xlock/ \ LOCAL/jgh/x11/${PORTNAME}/ @@ -161,6 +160,8 @@ pre-extract: post-patch: @${REINPLACE_CMD} -e '/xglockrc/ s|PROGRAM|DATA|' ${WRKSRC}/xglock/Makefile.in + @${REINPLACE_CMD} -e 's|$$(SOUNDPATH)|$$(DESTDIR)$$(SOUNDPATH)|g' ${WRKSRC}/modes/Makefile.in + @${REINPLACE_CMD} -e '/$$(ETCDIR)play.sh/ s|$$(INSTALL_PROGRAM)|$$(INSTALL_PROGRAM:N-s)|' ${WRKSRC}/modes/Makefile.in .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100000 @${REINPLACE_CMD} -e 's|/usr/games/fortune|/usr/bin/fortune|' ${WRKSRC}/modes/Makefile.in .endif diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo index f342f9e9b9c0..8b96d0305557 100644 --- a/x11/xlockmore/distinfo +++ b/x11/xlockmore/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1501006779 -SHA256 (xlockmore-5.54.tar.xz) = 9f4facb9721cc01450db0c11ffecd26a739b046e425e02628831a66080a0af55 -SIZE (xlockmore-5.54.tar.xz) = 1647652 +TIMESTAMP = 1531500962 +SHA256 (xlockmore-5.55.tar.xz) = d4f1fa5b19efc20262d77207636aa54fc66ba40aa867119f03a15981b3396ef8 +SIZE (xlockmore-5.55.tar.xz) = 1650116 diff --git a/x11/xlockmore/files/patch-xglock_xglock.c b/x11/xlockmore/files/patch-xglock_xglock.c new file mode 100644 index 000000000000..b61afd309e4a --- /dev/null +++ b/x11/xlockmore/files/patch-xglock_xglock.c @@ -0,0 +1,30 @@ +--- xglock/xglock.c.orig 2017-01-06 05:18:57 UTC ++++ xglock/xglock.c +@@ -1,3 +1,27 @@ ++Assertion failed: (SE.DT.dominates(Ret, &*BIP)), function ReuseOrCreateCast, file /usr/src/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp, line 83. ++cc: error: unable to execute command: Abort trap (core dumped) ++cc: error: clang frontend command failed due to signal (use -v to see invocation) ++ ++--- xglock/xglock.c.orig 2018-07-08 11:29:53 UTC +++++ xglock/xglock.c ++@@ -1489,7 +1489,7 @@ static void ++ create_boolOptions_buttons(GtkScrolledWindow *parent) ++ { ++ gint i; ++- gpointer iptr = 0; +++ guint iptr = 0; ++ GtkWidget *box0; ++ GtkWidget *box1; ++ GtkWidget *box2; ++@@ -1514,7 +1514,7 @@ create_boolOptions_buttons(GtkScrolledWindow *parent) ++ gtk_box_pack_start(GTK_BOX(i%2 ? box1 : box2), button, TRUE, TRUE, 0); ++ gtk_signal_connect(GTK_OBJECT(button), "clicked", ++ (GtkSignalFunc) bool_option_clicked_cb, ++- iptr++); +++ GUINT_TO_POINTER(iptr++)); ++ gtk_widget_show(button); ++ } ++ } + /*- + * xglock.c - main file for xglock, the GTK+ gui interface to xlock. + * diff --git a/x11/xlockmore/pkg-plist b/x11/xlockmore/pkg-plist index 83ad20bcb550..bfc3fca881af 100644 --- a/x11/xlockmore/pkg-plist +++ b/x11/xlockmore/pkg-plist @@ -2,8 +2,13 @@ @mode 4111 @owner root bin/xlock +bin/play.sh @mode @owner lib/X11/app-defaults/XLock man/man1/xlock.1.gz +share/xlock/sounds/complete.au +share/xlock/sounds/identify-please.au +share/xlock/sounds/not-programmed.au +share/xlock/sounds/thank-you.au %%GTK2%%share/xlock/xglockrc |