From c2bd3a43342e37a05a97e12581dd2bd52993877a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 31 Mar 2011 20:20:09 +0200
Subject: Revert "fix conflict, autoseect libgcj"

This reverts commit ac46bdeef28bc2b65e1880884a79257c28e423a7, reversing
changes made to 418fb3668f7140cc3e2ba07c354fe0d9bbb47d04.
---
 package/beecrypt/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'package/beecrypt')

diff --git a/package/beecrypt/Makefile b/package/beecrypt/Makefile
index 5e1e71e50..333434a37 100644
--- a/package/beecrypt/Makefile
+++ b/package/beecrypt/Makefile
@@ -15,14 +15,13 @@ PKG_NEED_CXX:=		1
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,BEECRYPT,beecrypt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BEECRYPT,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--without-cplusplus \
 			--without-python \
 			--without-java
 
-beecrypt-install:
+post-install:
 	$(INSTALL_DIR) $(IDIR_BEECRYPT)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libbeecrypt*.so* \
 		$(IDIR_BEECRYPT)/usr/lib
-- 
cgit v1.2.3


From f4e50548b0d41f5b4e6faae3ddc7283dd1a5dd6c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 31 Mar 2011 20:21:13 +0200
Subject: I am to tupid for git, today.

Revert "Revert "fix conflict, autoseect libgcj""

This reverts commit c2bd3a43342e37a05a97e12581dd2bd52993877a.
---
 package/beecrypt/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'package/beecrypt')

diff --git a/package/beecrypt/Makefile b/package/beecrypt/Makefile
index 333434a37..5e1e71e50 100644
--- a/package/beecrypt/Makefile
+++ b/package/beecrypt/Makefile
@@ -15,13 +15,14 @@ PKG_NEED_CXX:=		1
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,BEECRYPT,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BEECRYPT,beecrypt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--without-cplusplus \
 			--without-python \
 			--without-java
 
-post-install:
+beecrypt-install:
 	$(INSTALL_DIR) $(IDIR_BEECRYPT)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libbeecrypt*.so* \
 		$(IDIR_BEECRYPT)/usr/lib
-- 
cgit v1.2.3


From bd015df1e472968ad28099544740f7b7e514312e Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 31 Mar 2011 22:27:39 +0200
Subject: add lxde components, update libpng and firefox

---
 package/beecrypt/patches/patch-include_beecrypt_gnu_h | 11 +++++++++++
 package/beecrypt/patches/patch-ltmain_sh              | 11 +++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 package/beecrypt/patches/patch-include_beecrypt_gnu_h
 create mode 100644 package/beecrypt/patches/patch-ltmain_sh

(limited to 'package/beecrypt')

diff --git a/package/beecrypt/patches/patch-include_beecrypt_gnu_h b/package/beecrypt/patches/patch-include_beecrypt_gnu_h
new file mode 100644
index 000000000..41b1f5953
--- /dev/null
+++ b/package/beecrypt/patches/patch-include_beecrypt_gnu_h
@@ -0,0 +1,11 @@
+--- beecrypt-4.2.1.orig/include/beecrypt/gnu.h	2009-07-12 09:19:44.000000000 +0200
++++ beecrypt-4.2.1/include/beecrypt/gnu.h	2011-03-29 11:18:21.031808259 +0200
+@@ -72,7 +72,7 @@ typedef pthread_t bc_threadid_t;
+  * make assumptions about the size set by the configure script
+  */
+ #if !defined(MP_WBITS)
+-# define MP_WBITS	64U
++# define MP_WBITS	32U
+ #endif
+ 
+ #endif
diff --git a/package/beecrypt/patches/patch-ltmain_sh b/package/beecrypt/patches/patch-ltmain_sh
new file mode 100644
index 000000000..f018ba5c1
--- /dev/null
+++ b/package/beecrypt/patches/patch-ltmain_sh
@@ -0,0 +1,11 @@
+--- beecrypt-4.2.1.orig/ltmain.sh	2009-07-11 18:02:10.000000000 +0200
++++ beecrypt-4.2.1/ltmain.sh	2011-03-29 11:27:09.431818481 +0200
+@@ -4772,7 +4772,7 @@ func_mode_link ()
+       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+       # @file GCC response files
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
+         func_quote_for_eval "$arg"
+ 	arg="$func_quote_for_eval_result"
+         func_append compile_command " $arg"
-- 
cgit v1.2.3