Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4e0d7a67e12078b544ffe2ed0a76c868635f7872
commit 4e0d7a67e12078b544ffe2ed0a76c868635f7872 Author: crazy <[email protected]> Date: Sat Oct 17 01:38:07 2015 +0200 blackbox-0.70.1-6-x86_64 * move to extra * added patches to fix the build diff --git a/source/xlib/blackbox/FrugalBuild b/source/xapps-extra/blackbox/FrugalBuild similarity index 74% rename from source/xlib/blackbox/FrugalBuild rename to source/xapps-extra/blackbox/FrugalBuild index 2762c1b..8b6610c 100644 --- a/source/xlib/blackbox/FrugalBuild +++ b/source/xapps-extra/blackbox/FrugalBuild @@ -4,7 +4,7 @@ pkgname=blackbox pkgver=0.70.1 -pkgrel=5 +pkgrel=6 pkgdesc="A fast, light window manager without any annoying library dependencies." pkgdesc_localized=('hu_HU Egy gyors, könnyû ablakkezelõ, mindenféle bosszantó függõség nélkül.') _F_sourceforge_realname=blackboxwm @@ -13,18 +13,25 @@ Finclude sourceforge url="http://blackboxwm.sourceforge.net"; depends=('libstdc++' 'libxft>=2.1.13-2' 'zlib') makedepends=('xorg-server') -groups=('xlib') +groups=('xapps-extra') archs=('i686' 'x86_64') source=($source $pkgname-$pkgver-gcc-4.3.patch xinitrc.$pkgname \ - $pkgname.desktop) + $pkgname.desktop bt-textP.patch as-needed.patch) sha1sums=('f0ab7e4b44ae6ee4c2a2136651afc567c47fe2cd' \ 'e8db616f0c134575eaf096ec0aa72f47e355b86f' \ 'fa1b40cd18f9d2a4a1f10af41b269bd089a45f3c' \ - '9533bdd9b6765e49676ce8d5e8ad8ff74501ebe1') + '9533bdd9b6765e49676ce8d5e8ad8ff74501ebe1' \ + '069d55cdf38b9808c92ec11a661021f5c78aee56' \ + '94af138b8603fe7acd101a6cb46f5965b683b80f') build() { - Fbuild --enable-nls + Fcd + Fpatchall + Fautoreconf + Fconf --enable-nls + Fmake + Fmakeinstall Fexe /etc/X11/xinit/xinitrc.$pkgname Ffile /etc/X11/sessions/$pkgname.desktop } diff --git a/source/xapps-extra/blackbox/as-needed.patch b/source/xapps-extra/blackbox/as-needed.patch new file mode 100644 index 0000000..e75d323 --- /dev/null +++ b/source/xapps-extra/blackbox/as-needed.patch @@ -0,0 +1,44 @@ +--- src/Makefile.am ++++ src/Makefile.am +@@ -22,7 +22,7 @@ + + DEFAULT_MENU = $(pkgdatadir)/menu + DEFAULT_STYLE = $(pkgdatadir)/styles/Gray +-CPPFLAGS = @CPPFLAGS@ @SHAPE@ @XFT@ @DEBUG@ @NLS@ \ ++AM_CPPFLAGS = @SHAPE@ @XFT@ @DEBUG@ @NLS@ \ + -DLOCALEPATH=\"$(pkgdatadir)/nls\" \ + -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \ + -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \ +--- lib/Makefile.am ++++ lib/Makefile.am +@@ -62,7 +62,8 @@ + Util.hh \ + XDG.hh + +-libbt_la_LIBADD = @ICONV@ @LOCALE@ ++libbt_la_LIBADD = @ICONV@ @LOCALE@ @xft_LIBS@ ++libbt_la_CFLAGS = @xft_CFLAGS@ + + pkgconfigdir = $(libdir)/pkgconfig + nodist_pkgconfig_DATA = libbt.pc +--- util/Makefile.am ++++ util/Makefile.am +@@ -21,7 +21,7 @@ + # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + # DEALINGS IN THE SOFTWARE. + +-CPPFLAGS = @CPPFLAGS@ @DEBUG@ @NLS@ \ ++AM_CPPFLAGS = @DEBUG@ @NLS@ \ + -I$(top_srcdir)/lib + + bin_SCRIPTS = bsetbg +--- configure.ac ++++ configure.ac +@@ -29,7 +29,7 @@ + AC_PROG_INSTALL + + dnl libbt shouldn't be shared by default (yet) +-AC_DISABLE_SHARED ++dnl AC_DISABLE_SHARED + AC_PROG_LIBTOOL + AC_SUBST(LIBTOOL_DEPS) diff --git a/source/xlib/blackbox/blackbox-0.70.1-gcc-4.3.patch b/source/xapps-extra/blackbox/blackbox-0.70.1-gcc-4.3.patch similarity index 100% rename from source/xlib/blackbox/blackbox-0.70.1-gcc-4.3.patch rename to source/xapps-extra/blackbox/blackbox-0.70.1-gcc-4.3.patch diff --git a/source/xlib/blackbox/blackbox.desktop b/source/xapps-extra/blackbox/blackbox.desktop similarity index 100% rename from source/xlib/blackbox/blackbox.desktop rename to source/xapps-extra/blackbox/blackbox.desktop diff --git a/source/xapps-extra/blackbox/bt-textP.patch b/source/xapps-extra/blackbox/bt-textP.patch new file mode 100644 index 0000000..43a788c --- /dev/null +++ b/source/xapps-extra/blackbox/bt-textP.patch @@ -0,0 +1,21 @@ +--- a/lib/Util.hh ++++ b/lib/Util.hh +@@ -25,6 +25,8 @@ + #ifndef __Util_hh + #define __Util_hh + ++#include <X11/Xutil.h> ++ + #include <limits.h> + #include <string> + +@@ -94,10 +96,8 @@ + + std::string tolower(const std::string &string); + +-#ifdef _XUTIL_H_ + std::string textPropertyToString(::Display *display, + ::XTextProperty& text_prop); +-#endif + + } // namespace bt diff --git a/source/xlib/blackbox/xinitrc.blackbox b/source/xapps-extra/blackbox/xinitrc.blackbox similarity index 100% rename from source/xlib/blackbox/xinitrc.blackbox rename to source/xapps-extra/blackbox/xinitrc.blackbox
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
