Author: pebender
Date: Sun Dec 28 16:00:01 2008
New Revision: 4142
Removed:
trunk/gar-minimyth/script/utils/cwiid/files/cwiid-0.6.00-gtk.patch
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/utils/cwiid/Makefile
trunk/gar-minimyth/script/utils/cwiid/checksums
trunk/gar-minimyth/script/utils/cwiid/files/cwiid-0.6.00-rootdir.patch
Log:
- Enabled building of wmgui in utils/cwiid package.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Sun Dec 28
16:00:01 2008
@@ -50,6 +50,9 @@
- Fixed a bug that caused MPlayer configuration to fail when using the
perl init scripts.
+Modified build system
+ - Enabled building of wmgui in utils/cwiid package.
+
Fixed build system
- Patched lib/bluez, lib/dbus and net/portmap so that their binaries
are
recognized as executables rather than shared objects by disabling
gcc pie
Modified: trunk/gar-minimyth/script/utils/cwiid/Makefile
==============================================================================
--- trunk/gar-minimyth/script/utils/cwiid/Makefile (original)
+++ trunk/gar-minimyth/script/utils/cwiid/Makefile Sun Dec 28 16:00:01 2008
@@ -3,28 +3,31 @@
CATEGORIES = utils
MASTER_SITES = http://abstrakraft.org/cwiid/downloads/
DISTFILES = $(DISTNAME).tgz
-PATCHFILES = $(DISTNAME)-hci_remote_name.patch $(DISTNAME)-gtk.patch
$(DISTNAME)-rootdir.patch $(DISTNAME)-ioctl_ui_set_phys.patch
$(DISTNAME)-wait_forever_sleep.patch
+PATCHFILES = $(DISTNAME)-hci_remote_name.patch $(DISTNAME)-rootdir.patch
$(DISTNAME)-ioctl_ui_set_phys.patch $(DISTNAME)-wait_forever_sleep.patch
LICENSE = GPL2
DESCRIPTION =
define BLURB
endef
-DEPENDS = lib/bluez
+DEPENDS = lib/bluez gtk/gtk+
-CONFIGURE_SCRIPTS = $(WORKSRC)/configure
-BUILD_SCRIPTS = $(WORKSRC)/Makefile
-INSTALL_SCRIPTS = $(WORKSRC)/Makefile
+CONFIGURE_SCRIPTS = $(WORKSRC)/configure
+BUILD_SCRIPTS = $(WORKSRC)/Makefile
+INSTALL_SCRIPTS = $(WORKSRC)/Makefile
CONFIGURE_ARGS = $(DIRPATHS) --build=$(GARBUILD) --host=$(GARHOST) \
- --without-gtk \
--without-python \
--disable-ldconfig
include ../../gar.mk
+# -Wl,--as-needed does not work when compiling wmgui.
+LDFLAGS :=
+
pre-configure:
- @cd $(WORKSRC) ; autoreconf --verbose --install --force
+ @#cd $(WORKSRC) ; autoreconf --verbose --install --force
+ @$(call FIX_LIBTOOL,$(WORKSRC)/configure)
@$(MAKECOOKIE)
post-install:
Modified: trunk/gar-minimyth/script/utils/cwiid/checksums
==============================================================================
--- trunk/gar-minimyth/script/utils/cwiid/checksums (original)
+++ trunk/gar-minimyth/script/utils/cwiid/checksums Sun Dec 28 16:00:01 2008
@@ -1,6 +1,5 @@
8d574afdeedc5e5309c87a72d744316a download/cwiid-0.6.00.tgz
b84cef13b1c4162d63628175d59fa316
download/cwiid-0.6.00-hci_remote_name.patch
-3c432fa1452bbbaef1a7e2433132581b download/cwiid-0.6.00-gtk.patch
-531f0da42322131bcf0cf0f873bf408f download/cwiid-0.6.00-rootdir.patch
+6ad82955141a26dc462d881f4c730486 download/cwiid-0.6.00-rootdir.patch
4ae120ada9e5645658391f105283e944
download/cwiid-0.6.00-ioctl_ui_set_phys.patch
acb0ac39c50dc820eeb1e95a653c5822
download/cwiid-0.6.00-wait_forever_sleep.patch
Modified:
trunk/gar-minimyth/script/utils/cwiid/files/cwiid-0.6.00-rootdir.patch
==============================================================================
--- trunk/gar-minimyth/script/utils/cwiid/files/cwiid-0.6.00-rootdir.patch
(original)
+++ trunk/gar-minimyth/script/utils/cwiid/files/cwiid-0.6.00-rootdir.patch
Sun Dec 28 16:00:01 2008
@@ -1,6 +1,6 @@
diff -Naur cwiid-0.6.00-old/defs.mak.in cwiid-0.6.00-new/defs.mak.in
--- cwiid-0.6.00-old/defs.mak.in 2007-07-28 11:47:03.000000000 -0700
-+++ cwiid-0.6.00-new/defs.mak.in 2008-01-30 13:11:20.000000000 -0800
++++ cwiid-0.6.00-new/defs.mak.in 2008-12-28 15:53:38.000000000 -0800
@@ -28,8 +28,8 @@
ROOTDIR = $(DESTDIR:%/=%)
endif
@@ -13,9 +13,9 @@
DEBUGFLAGS = -g
WARNFLAGS = -Wall -W
diff -Naur cwiid-0.6.00-old/Makefile.in cwiid-0.6.00-new/Makefile.in
---- cwiid-0.6.00-old/Makefile.in 2008-01-30 12:59:14.000000000 -0800
-+++ cwiid-0.6.00-new/Makefile.in 2008-01-30 13:10:38.000000000 -0800
-@@ -29,27 +29,27 @@
+--- cwiid-0.6.00-old/Makefile.in 2007-07-28 11:47:03.000000000 -0700
++++ cwiid-0.6.00-new/Makefile.in 2008-12-28 15:53:38.000000000 -0800
+@@ -26,27 +26,27 @@
endif
ifeq ($(MAKECMDGOALS),install)
@@ -52,7 +52,7 @@
diff -Naur cwiid-0.6.00-old/wminput/Makefile.in
cwiid-0.6.00-new/wminput/Makefile.in
--- cwiid-0.6.00-old/wminput/Makefile.in 2007-07-28 11:47:03.000000000
-0700
-+++ cwiid-0.6.00-new/wminput/Makefile.in 2008-01-30 13:10:24.000000000
-0800
++++ cwiid-0.6.00-new/wminput/Makefile.in 2008-12-28 15:53:38.000000000
-0800
@@ -41,16 +41,16 @@
$(MAKE) $(MAKECMDGOALS) -C plugins
@@ -78,7 +78,7 @@
$(AWK) -f action_enum.awk action_enum.txt > action_enum.c
diff -Naur cwiid-0.6.00-old/wminput/plugins/acc/Makefile.in
cwiid-0.6.00-new/wminput/plugins/acc/Makefile.in
--- cwiid-0.6.00-old/wminput/plugins/acc/Makefile.in 2007-04-10
19:57:27.000000000 -0700
-+++ cwiid-0.6.00-new/wminput/plugins/acc/Makefile.in 2008-01-30
13:15:21.000000000 -0800
++++ cwiid-0.6.00-new/wminput/plugins/acc/Makefile.in 2008-12-28
15:53:38.000000000 -0800
@@ -6,7 +6,7 @@
SOURCES = acc.c
CFLAGS += -...@top_builddir@/wminput -...@top_builddir@/libcwiid
@@ -90,7 +90,7 @@
diff -Naur cwiid-0.6.00-old/wminput/plugins/ir_ptr/Makefile.in
cwiid-0.6.00-new/wminput/plugins/ir_ptr/Makefile.in
--- cwiid-0.6.00-old/wminput/plugins/ir_ptr/Makefile.in 2007-04-10
19:57:27.000000000 -0700
-+++ cwiid-0.6.00-new/wminput/plugins/ir_ptr/Makefile.in 2008-01-30
13:15:25.000000000 -0800
++++ cwiid-0.6.00-new/wminput/plugins/ir_ptr/Makefile.in 2008-12-28
15:53:38.000000000 -0800
@@ -5,7 +5,7 @@
PLUGIN_NAME = ir_ptr
SOURCES = ir_ptr.c
@@ -102,7 +102,7 @@
diff -Naur cwiid-0.6.00-old/wminput/plugins/nunchuk_acc/Makefile.in
cwiid-0.6.00-new/wminput/plugins/nunchuk_acc/Makefile.in
--- cwiid-0.6.00-old/wminput/plugins/nunchuk_acc/Makefile.in 2007-04-10
19:57:27.000000000 -0700
-+++ cwiid-0.6.00-new/wminput/plugins/nunchuk_acc/Makefile.in 2008-01-30
13:15:33.000000000 -0800
++++ cwiid-0.6.00-new/wminput/plugins/nunchuk_acc/Makefile.in 2008-12-28
15:53:38.000000000 -0800
@@ -6,7 +6,7 @@
SOURCES = nunchuk_acc.c
CFLAGS += -...@top_builddir@/wminput -...@top_builddir@/libcwiid
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
