Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=593d1ab4f4640ae7c455ca820917f90efaa9a16c
commit 593d1ab4f4640ae7c455ca820917f90efaa9a16c Author: DeX77 <[email protected]> Date: Mon Apr 27 17:11:53 2015 +0200 edelib-2.1-2-x86_64 + add patch for fltk>=1.3.3 diff --git a/source/xlib-extra/edelib/FrugalBuild b/source/xlib-extra/edelib/FrugalBuild index 5eef193..d5168a5 100644 --- a/source/xlib-extra/edelib/FrugalBuild +++ b/source/xlib-extra/edelib/FrugalBuild @@ -1,25 +1,31 @@ # Compiling Time: 0.17 SBU # Maintainer: Baste <[email protected]> +options+=('asneeded') + pkgname=edelib pkgver=2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Is small and portable C++ library for EDE" _F_sourceforge_dirname="ede" Finclude sourceforge url="http://equinox-project.org/" -depends=('dbus' 'fltk') +depends=('dbus' 'fltk>=1.3.3') makedepends=('jam' 'doxygen') groups=('xlib-extra') archs=('i686' 'x86_64') -sha1sums=('a3942cb076a4a33840cc2b22f31f0cc768ba3a2a') +source=("${source[@]}" \ + fltk.patch) +sha1sums=('a3942cb076a4a33840cc2b22f31f0cc768ba3a2a' \ + '18ab84a805979ff39af287c64db600ea2325ceaf') build() { Fcd - ./autogen.sh + Fpatchall + Fautogen CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" - ./configure --prefix=/usr - jam - jam -sprefix=$Fdestdir/usr install + Fconf --prefix=/usr + Fexec jam + Fexec jam -sprefix=$Fdestdir/usr install } diff --git a/source/xlib-extra/edelib/fltk.patch b/source/xlib-extra/edelib/fltk.patch new file mode 100644 index 0000000..648d42d --- /dev/null +++ b/source/xlib-extra/edelib/fltk.patch @@ -0,0 +1,41 @@ +Index: src/WindowUtils.cpp +=================================================================== +--- src/WindowUtils.cpp (Revision 3591) ++++ src/WindowUtils.cpp (Revision 3593) +@@ -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,7 +195,7 @@ + XWMHints *hints = XAllocWMHints(); + hints->input = True; + hints->flags = InputHint; +- ++#if 0 + if(fl_show_iconic) { + hints->flags |= StateHint; + hints->initial_state = IconicState; +@@ -200,6 +202,7 @@ + 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()) { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
