[csw-devel] SF.net SVN: gar:[10568] csw/mgar/pkg/fbpanel/trunk
theferret at users.sourceforge.net
theferret at users.sourceforge.net
Thu Jul 22 20:33:34 CEST 2010
Revision: 10568
http://gar.svn.sourceforge.net/gar/?rev=10568&view=rev
Author: theferret
Date: 2010-07-22 18:33:33 +0000 (Thu, 22 Jul 2010)
Log Message:
-----------
fbpanel: compiles better now. but still has some runtime "issues"
Modified Paths:
--------------
csw/mgar/pkg/fbpanel/trunk/Makefile
csw/mgar/pkg/fbpanel/trunk/README
csw/mgar/pkg/fbpanel/trunk/pkginfo
Added Paths:
-----------
csw/mgar/pkg/fbpanel/trunk/patchfile.postconf
csw/mgar/pkg/fbpanel/trunk/patchfile.preconf
Removed Paths:
-------------
csw/mgar/pkg/fbpanel/trunk/patchfile.post-conf
Modified: csw/mgar/pkg/fbpanel/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fbpanel/trunk/Makefile 2010-07-22 18:21:38 UTC (rev 10567)
+++ csw/mgar/pkg/fbpanel/trunk/Makefile 2010-07-22 18:33:33 UTC (rev 10568)
@@ -16,26 +16,34 @@
# Only use ONE here. The name is used for compat with 'gar'.
MASTER_SITES ?= http://sourceforge.net/projects/fbpanel/files/fbpanel/6.0/
+PATH := /opt/csw/gnu:/opt/csw/gcc4/bin:$(PATH)
+
ARCH := $(shell /bin/uname -p)
LDFLAGS_COMMON :=
SRCDIR= build/*
-# DO NOT specify the arch-64 stuff such as -m64 here.
-# the individual targets will do that.
-
+CC=cc
CFLAGS_COMMON ?= -mt -xnorunpath -xO2
CXXFLAGS_COMMON ?= -mt -norunpath -xO2
CFLAGS_sparc ?= -xarch=v8
CFLAGS_i386 ?= -xarch=386
-# Keep this arch-neutral if possible. add arch-specific tweaks
-# to arch-specific target
-CONFIGURE=./configure --prefix=/opt/csw
+#CC=gcc
+#CFLAGS_sparc ?= -mcpu=v8
+#CFLAGS_i386 ?= -xarch=386
+# WARNING: this is NOT a GNU-standard autoconfig
+# This is W.i.e.r.d.
+BUILD_ENV = CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_$(ARCH))" \
+ CPPFLAGS="-I/opt/csw/include" CC=$(CC)
+CONFIGURE=bash ./configure --prefix=/opt/csw
+
+
+
CREATEPKG=createpkg -r `pwd`/build/*/cswstage
@@ -111,14 +119,13 @@
touch $@
-#Note: I WANT to use LDFLAGS=-R$$ORIGIN, but stupid libtool
-# wont allow it! so force it at build time
+#Note: I WANT to use LDFLAGS=-R$$ORIGIN, etc. but
+# their wierd build system wont allow it! so force it at build time
+# Note also.. this is NOT the "normal" GNU autoconf !!
build/.configure-$(ARCH)-32.done: build/.patch-preconf.done
@echo handling $@ target
(cd $(SRCDIR) ; \
- CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_$(ARCH))" \
- CXXFLAGS="$(CXXFLAGS_COMMON)" \
- LDFLAGS='-R/opt/csw/lib -L/opt/csw/lib' \
+ $(BUILD_ENV) \
$(CONFIGURE) )
if test -f patchfile.postconf ; then \
gpatch -d $(SRCDIR) -p0 <patchfile.postconf ; fi
@@ -126,9 +133,13 @@
# See note about LDFLAGS and ORIGIN, higher up
+# Also note that since fbpanel comes with 'modules', using
+# $ORIGIN wont work as desired.
+# AAAND.. it has a custom "rules.mk", so it tends to ignore
+# the normally-set configure-time CFLAGS and so on. arg.
build/.build-$(ARCH)-32.done:
@echo handling $@ target
- LD_OPTIONS='-R$$ORIGIN' $(MAKE) -C $(SRCDIR) $(MFLAGS)
+ LD_OPTIONS='-R/opt/csw/lib' $(BUILD_ENV) $(MAKE) -C $(SRCDIR) $(MFLAGS)
touch $@
Modified: csw/mgar/pkg/fbpanel/trunk/README
===================================================================
--- csw/mgar/pkg/fbpanel/trunk/README 2010-07-22 18:21:38 UTC (rev 10567)
+++ csw/mgar/pkg/fbpanel/trunk/README 2010-07-22 18:33:33 UTC (rev 10568)
@@ -4,20 +4,12 @@
But I'm keeping my work in svn
(and a package in experimental)
-0. configuration is WEEERID.and very nonportable.
- takes GNU autoconf,and makes it dumber.
- It breaks gmake MFLAGS=-j, among other things.
+it has a few problems. Problems first, Notes, lower down.
-1. Have to have /opt/csw/gnu first in path.
+PROBLEMS:
-2. have to run configure with bash -x.
- its already #!/bin/bash but that dont work?!?!?
-3. CC=gcc. its just got too many gnuisms.
-
-4. need to set cpu type in there somehow too...
-
-5. It uses /usr/share/icons/hicolor/* as its icons path
+*. It uses /usr/share/icons/hicolor/* as its icons path
So that means it technically depends on
SUNWgnome-themes-share
We COULD get it to depend on CSWxfceiconthemes.
@@ -32,9 +24,28 @@
THen need to set theme_engine or something...
- gtk_icon_theme_load_icon() is at fault
+*. Need to FIX PLUGINS!! (net, cpu, mem)
+ (which requires porting. See patches to xfce_systemtray for
+ that sort of thing)
- 6. Need to FIX PLUGINS!! (net, cpu, mem)
+NOTES:
+
+*. configuration is WEEERID.and very nonportable.
+ takes GNU autoconf,and makes it dumber.
+ It breaks gmake MFLAGS=-j, among other things.
+
+*. Have to have /opt/csw/gnu first in path.. fixed in makefile
+
+*. have to run configure with bash.
+ its already #!/bin/bash but that dont work?!?!?
+
+*. It has some kind of WEIIIIERD "rfs-scripts-xxxx" wrappers
+ aroung things like pkg-config. Arrg.
+ And it does it by hacking configure, to do
+ "source scripts/custom.sh"
+
+ Now provide own custom.sh
+
Deleted: csw/mgar/pkg/fbpanel/trunk/patchfile.post-conf
===================================================================
--- csw/mgar/pkg/fbpanel/trunk/patchfile.post-conf 2010-07-22 18:21:38 UTC (rev 10567)
+++ csw/mgar/pkg/fbpanel/trunk/patchfile.post-conf 2010-07-22 18:33:33 UTC (rev 10568)
@@ -1,11 +0,0 @@
---- panel/Makefile.in.orig 2010-06-22 02:25:29.676465806 +0200
-+++ panel/Makefile.in 2010-06-22 02:25:37.159948629 +0200
-@@ -5,7 +5,7 @@
- #SRCS += configurator.c
-
- BINTARGET = fbpanel
--LDFLAGS += $(GMODULE_LIBS)
-+LDFLAGS += $(GMODULE_LIBS) -lX11
-
- ifeq (enabled,$(STATIC_BUILD))
- OBJS += $(wildcard $(TOPDIR)/plugins/*/*.o)
Added: csw/mgar/pkg/fbpanel/trunk/patchfile.postconf
===================================================================
--- csw/mgar/pkg/fbpanel/trunk/patchfile.postconf (rev 0)
+++ csw/mgar/pkg/fbpanel/trunk/patchfile.postconf 2010-07-22 18:33:33 UTC (rev 10568)
@@ -0,0 +1,11 @@
+--- panel/Makefile.in.orig 2010-06-22 02:25:29.676465806 +0200
++++ panel/Makefile.in 2010-06-22 02:25:37.159948629 +0200
+@@ -5,7 +5,7 @@
+ #SRCS += configurator.c
+
+ BINTARGET = fbpanel
+-LDFLAGS += $(GMODULE_LIBS)
++LDFLAGS += $(GMODULE_LIBS) -lX11
+
+ ifeq (enabled,$(STATIC_BUILD))
+ OBJS += $(wildcard $(TOPDIR)/plugins/*/*.o)
Added: csw/mgar/pkg/fbpanel/trunk/patchfile.preconf
===================================================================
--- csw/mgar/pkg/fbpanel/trunk/patchfile.preconf (rev 0)
+++ csw/mgar/pkg/fbpanel/trunk/patchfile.preconf 2010-07-22 18:33:33 UTC (rev 10568)
@@ -0,0 +1,56 @@
+--- scripts/custom.sh.orig Sun Feb 21 11:05:12 2010
++++ scripts/custom.sh Mon Jul 19 19:49:30 2010
+@@ -17,15 +17,15 @@
+ # Custom
+ add_feature dependency "disable dependency tracking" disabled
+
+-add_var glib_cflags "glib cflags" '`RFS=$rfs scripts/rfs-pkg-config --cflags glib-2.0`'
+-add_var gtk_cflags "gtk cflags" '`RFS=$rfs scripts/rfs-pkg-config --cflags gtk+-2.0`'
++add_var glib_cflags "glib cflags" '`pkg-config --cflags glib-2.0`'
++add_var gtk_cflags "gtk cflags" '`pkg-config --cflags gtk+-2.0`'
+
+-add_var glib_libs "glib libs" '`RFS=$rfs scripts/rfs-pkg-config --libs glib-2.0`'
+-add_var gtk_libs "gtk libs" '`RFS=$rfs scripts/rfs-pkg-config --libs gtk+-2.0`'
++add_var glib_libs "glib libs" '`pkg-config --libs glib-2.0`'
++add_var gtk_libs "gtk libs" '`pkg-config --libs gtk+-2.0`'
+
+ add_var cflagsx "C flags" '-I$topdir/panel $glib_cflags $gtk_cflags -fPIC'
+ add_var ldflagsx "linker flags" '$glib_libs $gtk_libs'
+
+-add_var gmodule_libs "gmodule libs" '`scripts/rfs-pkg-config --libs gmodule-2.0`'
++add_var gmodule_libs "gmodule libs" '`pkg-config --libs gmodule-2.0`'
+
+-add_feature static_build "build all pluginis into main binary" disabled
++#add_feature static_build "build all pluginis into main binary" disabled
+--- rules.mk.orig Thu Jul 22 20:09:19 2010
++++ rules.mk Thu Jul 22 20:09:43 2010
+@@ -35,12 +35,12 @@
+ ##
+ # if CFLAGS wasn't set by package builder set it to -O2
+ # warnings on, and path to #include <config.h>
+-ifeq ($(DEBUG),enabled)
+- override CFLAGS = -Wall -I$(TOPDIR) -g -Werror
+-else
+- CFLAGS += -O2 -Wall -I$(TOPDIR)
+-endif
+-
++#ifeq ($(DEBUG),enabled)
++# override CFLAGS = -Wall -I$(TOPDIR) -g -Werror
++#else
++# CFLAGS += -O2 -Wall -I$(TOPDIR)
++#endif
++ CFLAGS += -I$(TOPDIR)
+
+ T := $(subst $(TOPDIR)/,,$(CURDIR)/)
+ T := $(subst /, ,$(T))
+--- dbg.h.orig Thu Jul 22 20:16:35 2010
++++ dbg.h Thu Jul 22 20:22:59 2010
+@@ -1,5 +1,8 @@
+ #include <stdio.h>
+
++#ifdef __SUNPRO_C
++#define __FUNCTION__ __func__
++#endif
+ #define ERR(fmt, args...) fprintf(stderr, fmt, ## args)
+ #define DBG2(fmt, args...) fprintf(stderr, "%s:%s:%-5d: " fmt, __FILE__, __FUNCTION__, __LINE__, ## args)
+ #define DBGE2(fmt, args...) fprintf(stderr, fmt, ## args)
Modified: csw/mgar/pkg/fbpanel/trunk/pkginfo
===================================================================
--- csw/mgar/pkg/fbpanel/trunk/pkginfo 2010-07-22 18:21:38 UTC (rev 10567)
+++ csw/mgar/pkg/fbpanel/trunk/pkginfo 2010-07-22 18:33:33 UTC (rev 10568)
@@ -1,6 +1,6 @@
PKG=CSWfbpanel
NAME=fbpanel - GUI panel for NETWM compliant window managers
-VERSION=6.0,REV=2010.06.22
+VERSION=6.0,REV=YYYY.MM.DD
CATEGORY=application
VENDOR=http://fbpanel.sourceforge.net/ packaged for CSW by Philip Brown
HOTLINE=http://www.opencsw.org/bugtrack/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list