Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-10-01 06:32:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libraries/edelib: Fix compatibility with new fltk13.

Browse source 
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
David Spencer 2015-06-29 14:19:13 +07:00 committed by Willy Sudiarto Raharjo
parent 3fd47ab341
commit 8b9bda102e
2 changed files with 49 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/edelib/edelib.SlackBuild
View file

@ -24,7 +24,7 @@
PRGNAM=edelib
VERSION=${VERSION:-2.1}
BUILD=${BUILD:-1}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@ -69,7 +69,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}/fltk13" \
patch -p1 < $CWD/edelib.patch
LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \
FLTK_CONFIG="/usr/bin/fltk13-config" \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@ -80,7 +81,7 @@ CXXFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--with-fltk-path=/usr/lib${LIBDIRSUFFIX}/fltk13 \
--with-fltk-path=/usr/lib${LIBDIRSUFFIX}/ \
--enable-profile \
--enable-shared \
--enable-largefile \

45
libraries/edelib/edelib.patch Normal file
View file

@ -0,0 +1,45 @@
--- edelib/src/WindowUtils.cpp
+++ edelib/src/WindowUtils.cpp
@@ -1,5 +1,5 @@
/*
- * $Id: WindowUtils.cpp 3106 2011-10-21 20:26:08Z karijes $
+ * $Id: WindowUtils.cpp 3592 2014-12-02 12:48:07Z karijes $
*
* Window utils
* Copyright (c) 1998-2006 by Bill Spitzak and others
@@ -33,8 +33,10 @@
* These are defined in FLTK as hidden variables for some internal hacks, but are used here.
* XXX: possible changes in future FLTK versions
*/
+#if 0
extern char fl_show_iconic;
extern int fl_disable_transient_for;
+#endif
EDELIB_NS_BEGIN
@@ -165,7 +167,7 @@
XChangeProperty(fl_display, xp->xid, XA_WM_CLASS, XA_STRING, 8, 0, (unsigned char *)buffer, p-buffer-1);
}
- if(win->non_modal() && xp->next && !fl_disable_transient_for) {
+ if(win->non_modal() && xp->next /* && !fl_disable_transient_for */) {
// find some other window to be "transient for":
Fl_Window* wp = xp->next->w;
while(wp->parent())
@@ -193,13 +195,14 @@
XWMHints *hints = XAllocWMHints();
hints->input = True;
hints->flags = InputHint;
-
+#if 0
if(fl_show_iconic) {
hints->flags |= StateHint;
hints->initial_state = IconicState;
fl_show_iconic = 0;
showit = 0;
}
+#endif
// This is not removed so it can be used with windows inherited from Fl_Window
if(win->icon()) {