[gentoo-commits] repo/gentoo:master commit in: x11-misc/habak/, x11-misc/habak/files/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/habak/, x11-misc/habak/files/

[Jeroen Roovers]

commit:     18c8587b2494fff7712b13021e54c16c8703cad6
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 14:20:57 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Nov 20 14:23:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18c8587b

x11-misc/habak: Update HOMEPAGE/SRC_URI

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Fixes: https://bugs.gentoo.org/700712
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 x11-misc/habak/Manifest                       |  1 +
 x11-misc/habak/files/habak-0.2.5-gentoo.patch | 30 ++++++++++++++++++++++
 x11-misc/habak/habak-0.2.5-r3.ebuild          | 37 +++++++++++++++++++++++++++
 3 files changed, 68 insertions(+)

diff --git a/x11-misc/habak/Manifest b/x11-misc/habak/Manifest
index c073f400fce..e3fc36262dc 100644
--- a/x11-misc/habak/Manifest
+++ b/x11-misc/habak/Manifest
@@ -1 +1,2 @@
+DIST habak-0.2.5-sourceforge.tar.gz 28747 BLAKE2B 60c6f60e0a16dca2091f41c9e4f419e5fb4be88a3ce44de98d91740f94e468fb7bd64bbf0b399b64035c21547b50fccf2e40954e0ff59ab1f1c0ce8dc6e56670 SHA512 4b1ff1484c65f74441b297e558360a8f2ea8f12ac63c4b74f846e41328dd84a1d619bde55e81224c3bd527897625e17bc07a6bb0d4cc3bd0eec6f4e787201277
 DIST habak-0.2.5.tar.bz2 22657 BLAKE2B 10b3c4808251b255bcf26935974514a2df5946520bd4bc080b9bdc551c727925c8b9a7485124013303654769b9daacff42d54fc0e5d567b26d99c5a75a0a50c2 SHA512 256ac24a3b322397b6cdbd2ca8add5938c77d166092a783234baa6186c3b4e01aeffd0b890749c7ac14aa39961e5fc6326f614ceb04eadfc5e4af282d04b7188

diff --git a/x11-misc/habak/files/habak-0.2.5-gentoo.patch b/x11-misc/habak/files/habak-0.2.5-gentoo.patch
new file mode 100644
index 00000000000..2dd77451f8a
--- /dev/null
+++ b/x11-misc/habak/files/habak-0.2.5-gentoo.patch
@@ -0,0 +1,30 @@
+--- a/src/Makefile
+--- b/src/Makefile
+@@ -2,22 +2,22 @@
+ #LDFLAGS = -L/usr/X11R6/lib -lImlib2 -lm -g -ggdb
+ 
+ CFLAGS += -I/usr/X11R6/include -Wall
+-LDFLAGS += -L/usr/X11R6/lib -lImlib2 -lm
++LIBS = -lm $(shell $(PKG_CONFIG) --libs imlib2 x11)
+ 
+ all:	habak
+ 	ln -f habak ../habak
+ 
+ habak:	xcore.o random.o habak.o
+-	gcc $(LDFLAGS) -o habak xcore.o random.o habak.o
++	$(CC) $(CFLAGS) $(LDFLAGS) -o habak xcore.o random.o habak.o $(LIBS)
+ 
+ habak.o: habak.c types.h defaults.h proto.h
+-	gcc $(CFLAGS) -c habak.c -o habak.o
++	$(CC) $(CFLAGS) -c habak.c -o habak.o
+ 
+ random.o: random.c proto.h
+-	gcc $(CFLAGS) -c random.c -o random.o
++	$(CC) $(CFLAGS) -c random.c -o random.o
+ 
+ xcore.o: xcore.c
+-	gcc $(CFLAGS) -c xcore.c -o xcore.o
++	$(CC) $(CFLAGS) -c xcore.c -o xcore.o
+ 
+ clean:
+ 	rm habak *.o

diff --git a/x11-misc/habak/habak-0.2.5-r3.ebuild b/x11-misc/habak/habak-0.2.5-r3.ebuild
new file mode 100644
index 00000000000..1dcc37e3e71
--- /dev/null
+++ b/x11-misc/habak/habak-0.2.5-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="A simple but powerful tool to set desktop wallpaper"
+HOMEPAGE="https://sourceforge.net/projects/fvwm-crystal/"
+SRC_URI="https://sourceforge.net/projects/fvwm-crystal/files/${PN}/${PV}/${P}.tar.gz/download -> ${P}-sourceforge.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	media-libs/imlib2[X]
+	x11-libs/libX11
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+DOCS=( ChangeLog README TODO "${FILESDIR}"/README.en )
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+	emake -C src ${PN}
+}
+
+src_install() {
+	dobin src/${PN}
+	einstalldocs
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/habak/, x11-misc/habak/files/

[Jeroen Roovers]

commit:     fad59b3a7142b73175bfaaa6035b6d333da1cfa0
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  2 09:40:07 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Feb  2 09:40:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fad59b3a

x11-misc/habak: Fix CFLAGS=-fno-common

Package-Manager: Portage-2.3.86, Repoman-2.3.20
Closes: https://bugs.gentoo.org/show_bug.cgi?id=707774
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 x11-misc/habak/files/habak-0.2.5-fno-common.patch | 33 +++++++++++++++++++++++
 x11-misc/habak/habak-0.2.5-r3.ebuild              |  3 ++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/x11-misc/habak/files/habak-0.2.5-fno-common.patch b/x11-misc/habak/files/habak-0.2.5-fno-common.patch
new file mode 100644
index 00000000000..0fad5f4df56
--- /dev/null
+++ b/x11-misc/habak/files/habak-0.2.5-fno-common.patch
@@ -0,0 +1,33 @@
+--- a/src/random.c
++++ b/src/random.c
+@@ -8,12 +8,15 @@
+ #include <regex.h>
+ 
+ #include <errno.h>
++
++#include "i.h"
++
+ extern int errno;
+ int syserr;
+ 
+ #define ALLOC_STEP 1000
+ regex_t regexp;
+-int size_files=0, used_files=0, i=0;
++int size_files=0, used_files=0;
+ char **files, *wyjscie;
+ regmatch_t matchpos;
+ 
+--- a/src/habak.c
++++ b/src/habak.c
+@@ -14,6 +14,7 @@
+ #include <Imlib2.h>
+ #include "types.h"
+ #include "proto.h"
++#include "i.h"
+ 
+ habak_l *current_list_item=NULL, *first_list_item=NULL;
+ habak_t *current_habak;
+--- /dev/null
++++ b/src/i.h
+@@ -0,0 +1 @@
++extern int i;

diff --git a/x11-misc/habak/habak-0.2.5-r3.ebuild b/x11-misc/habak/habak-0.2.5-r3.ebuild
index 1dcc37e3e71..4279398d92d 100644
--- a/x11-misc/habak/habak-0.2.5-r3.ebuild
+++ b/x11-misc/habak/habak-0.2.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,6 +23,7 @@ DEPEND="
 "
 DOCS=( ChangeLog README TODO "${FILESDIR}"/README.en )
 PATCHES=(
+	"${FILESDIR}"/${P}-fno-common.patch
 	"${FILESDIR}"/${P}-gentoo.patch
 )