diff options
78 files changed, 171 insertions, 930 deletions
diff --git a/conf/distro/familiar-0.8.3.conf b/conf/distro/familiar-0.8.3.conf index 7247bdfa53..dc333a3332 100644 --- a/conf/distro/familiar-0.8.3.conf +++ b/conf/distro/familiar-0.8.3.conf @@ -1,4 +1,4 @@ -include conf/distro/familiar.conf +include conf/distro/familiar-distro.conf DISTRO = "familiar" DISTRO_NAME = "Familiar Linux" @@ -17,6 +17,9 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" +PREFERRED_PROVIDER_virtual/libiconv=glibc +PREFERRED_PROVIDER_virtual/libintl=glibc +PREFERRED_PROVIDER_x11=diet-x11 # The CSL compiler is unusable because # 1) certain programs stop to compile diff --git a/conf/distro/familiar.conf b/conf/distro/familiar-distro.conf index 497ba6a89c..497ba6a89c 100644 --- a/conf/distro/familiar.conf +++ b/conf/distro/familiar-distro.conf diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc index eff175d098..118dc17302 100644 --- a/conf/distro/preferred-gpe-versions-2.7.inc +++ b/conf/distro/preferred-gpe-versions-2.7.inc @@ -42,12 +42,13 @@ PREFERRED_VERSION_gpe-login ?= "0.82" PREFERRED_VERSION_gpe-session-scripts ?= "0.65" PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" PREFERRED_VERSION_gpe-todo ?= "0.54" -PREFERRED_VERSION_gpe-calendar ?= "0.64" +PREFERRED_VERSION_gpe-calendar ?= "0.65" PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8" -PREFERRED_VERSION_gpe-contacts ?= "0.41" -PREFERRED_VERSION_gpe-today ?= "0.08" +PREFERRED_VERSION_gpe-contacts ?= "0.42" +PREFERRED_VERSION_gpe-today ?= "0.09" PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" PREFERRED_VERSION_dbus ?= "0.23.4" +PREFERRED_VERSION_gpe-beam ?= "0.2.8" PREFERRED_VERSION_gpe-bluetooth ?= "0.43" PREFERRED_VERSION_gpe-su ?= "0.18" PREFERRED_VERSION_gpe-conf ?= "0.1.25" diff --git a/packages/blueprobe/blueprobe_0.14.bb b/packages/blueprobe/blueprobe_0.14.bb new file mode 100644 index 0000000000..e54d2ed066 --- /dev/null +++ b/packages/blueprobe/blueprobe_0.14.bb @@ -0,0 +1,4 @@ +SECTION = "base" +LICENSE = "GPL" +inherit gpe + diff --git a/packages/debianutils/debianutils_2.13.2.bb b/packages/debianutils/debianutils_2.14.3.bb index b20ae66108..b20ae66108 100644 --- a/packages/debianutils/debianutils_2.13.2.bb +++ b/packages/debianutils/debianutils_2.14.3.bb diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb index 2af2816457..09f3de4adc 100644 --- a/packages/e17/entrance_20050810.bb +++ b/packages/e17/entrance_20050810.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Entrace is the Enlightenment login manager" +DESCRIPTION = "Entrance is the Enlightenment login manager" SECTION = "e/apps" LICENSE = "MIT" # can also use pam and crypt diff --git a/packages/gpe-beam/gpe-beam_0.2.8.bb b/packages/gpe-beam/gpe-beam_0.2.8.bb new file mode 100644 index 0000000000..d55cd6db60 --- /dev/null +++ b/packages/gpe-beam/gpe-beam_0.2.8.bb @@ -0,0 +1,12 @@ +PR = "r0" + +inherit gpe + +DESCRIPTION = "GPE infrared communication applet" +DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus" +RDEPENDS = "libopenobex-1.0-1 irda-utils" +SECTION = "gpe" +PRIORITY = "optional" +MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" +LICENSE = "GPL" + diff --git a/packages/gpe-calendar/gpe-calendar_0.65.bb b/packages/gpe-calendar/gpe-calendar_0.65.bb new file mode 100644 index 0000000000..da50299bcd --- /dev/null +++ b/packages/gpe-calendar/gpe-calendar_0.65.bb @@ -0,0 +1,11 @@ +LICENSE = "GPL" +PR = "r0" +GPE_TARBALL_SUFFIX = "bz2" + +inherit autotools gpe + +DEPENDS = "libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype" +SECTION = "gpe" +RDEPENDS = "gpe-icons" +DESCRIPTION = "GPE calendar" + diff --git a/packages/gpe-contacts/gpe-contacts_0.42.bb b/packages/gpe-contacts/gpe-contacts_0.42.bb new file mode 100644 index 0000000000..03735d942b --- /dev/null +++ b/packages/gpe-contacts/gpe-contacts_0.42.bb @@ -0,0 +1,14 @@ +LICENSE = "GPL" +inherit gpe autotools + +PR = "r0" + +DEPENDS = "libgpewidget libgpepimc libdisplaymigration libgpevtype dbus" +SECTION = "gpe" +RDEPENDS = "gpe-icons" +DESCRIPTION = "GPE contacts manager" +SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" + + +FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts" + diff --git a/packages/gpe-timesheet/gpe-timesheet_0.18.bb b/packages/gpe-timesheet/gpe-timesheet_0.18.bb new file mode 100644 index 0000000000..0cd8b539f0 --- /dev/null +++ b/packages/gpe-timesheet/gpe-timesheet_0.18.bb @@ -0,0 +1,9 @@ +LICENSE = "GPL" +inherit gpe + +DESCRIPTION = "GPE time tracker" +DEPENDS = "libgpewidget gtk+ sqlite" +SECTION = "gpe" +RDEPENDS = "gpe-icons" + +SRC_URI = "${GPE_MIRROR}/gpe-timesheet-${PV}.tar.gz" diff --git a/packages/ipkg/ipkg-0.99.129/.mtn2git_empty b/packages/gpe-today/gpe-today-0.09/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/ipkg/ipkg-0.99.129/.mtn2git_empty +++ b/packages/gpe-today/gpe-today-0.09/.mtn2git_empty diff --git a/packages/gpe-today/gpe-today-0.09/makefile.patch b/packages/gpe-today/gpe-today-0.09/makefile.patch new file mode 100644 index 0000000000..6f405a6d7f --- /dev/null +++ b/packages/gpe-today/gpe-today-0.09/makefile.patch @@ -0,0 +1,65 @@ +--- /tmp/Makefile 2005-09-01 17:07:30.218823872 +0200 ++++ gpe-today-0.09/Makefile 2005-09-01 17:07:32.698446912 +0200 +@@ -1,7 +1,7 @@ + PACKAGE = gpe-today + PREFIX = /usr/local + VERSION = 0.09 +-CVSBUILD = no ++CVSBUILD =no + #DEBUG = yes + #EFENCE = yes + +@@ -9,28 +9,27 @@ + + MEMBERS = main todo calendar date xsettings + +-GTKCFLAGS = `pkg-config --cflags gtk+-2.0` +-GTKLDFLAGS += `pkg-config --libs gtk+-2.0` +- +-CPPFLAGS = -I../libgpewidget -I../libeventdb -I../libtododb -I../libxsettings -I../libxsettings-client -D_GNU_SOURCE +- + ifeq ($(EFENCE),yes) +-LDFLAGS = -lefence ++PACKAGE_LDFLAGS = -lefence + endif + + ifeq ($(DEBUG),yes) +-CFLAGS = -g ++package_CFLAGS = -g + else +-CFLAGS = -Os -fomit-frame-pointer ++PACKAGE_CFLAGS = -Os -fomit-frame-pointer + endif + +-CFLAGS += -Wall $(GTKCFLAGS) +-LDFLAGS += $(GTKLDFLAGS) -L/usr/local/lib -L../libeventdb -leventdb -L../libtododb -ltododb -L../libxsettings -L../libxsettings-client -lXsettings-client -Wl,-rpath-link,../libxsettings -Wl,-rpath-link,../libgpepimc -Wl,-rpath-link,../libdisplaymigration +-CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" +-#CFLAGS += -MD +- + .SUFFIXES: .d + ++ifeq ($(CVSBUILD),yes) ++PACKAGE_CPPFLAGS += -I../libeventdb -I../libtododb -I../libxsettings -I../libxsettings-client -I../libdisplaymigration -I../libgpepimc ++PACKAGE_LDFLAGS += -L../libeventdb -L../libtododb -L../libxsettings-client -Wl,-rpath-link,../libxsettings -L../libgpepimc ++endif ++PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS) ++PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GPECFLAGS) ++PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GPELIBS) -leventdb -ltododb -lXsettings-client -lsqlite -lgpepimc ++ ++ + OBJS = $(patsubst %,%.o,$(MEMBERS)) + DEPS = $(patsubst %,%.d,$(MEMBERS)) + SOURCES = $(patsubst %,%.c,$(MEMBERS)) +@@ -43,10 +42,10 @@ + BUILD = build + endif + +-all: $(PACKAGE) all-mo ++all: $(PACKAGE) + + $(PACKAGE): $(OBJS) +- $(CC) -o $@ $^ -L../libgpewidget -lgpewidget -lsqlite $(LDFLAGS) ++ $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS) + + install-program: all $(PACKAGE).desktop + for i in $(PIXMAPS); do install -D -m 644 pixmaps/$$i $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/pixmaps/$$i; done diff --git a/packages/gpe-today/gpe-today_0.09.bb b/packages/gpe-today/gpe-today_0.09.bb new file mode 100644 index 0000000000..916b5ab50f --- /dev/null +++ b/packages/gpe-today/gpe-today_0.09.bb @@ -0,0 +1,9 @@ +LICENSE = "GPL" +inherit gpe + +DESCRIPTION = "Displays a summary of appointments and tasks for the day ahead" +DEPENDS = "gtk+ libxrandr libxsettings libxsettings-client libgpewidget libdisplaymigration libeventdb libgpepimc libtododb" +SECTION = "gpe" +PRIORITY = "optional" + +SRC_URI += "file://makefile.patch;patch=1" diff --git a/packages/ipkg/ipkg-0.99.129/buffer-overflow.patch b/packages/ipkg/ipkg-0.99.129/buffer-overflow.patch deleted file mode 100644 index 91234fd53f..0000000000 --- a/packages/ipkg/ipkg-0.99.129/buffer-overflow.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: ipkg_cmd.c -=================================================================== -RCS file: /cvs/familiar/dist/ipkg/C/ipkg_cmd.c,v -retrieving revision 1.96 -diff -u -r1.96 ipkg_cmd.c ---- C/ipkg_cmd.c 19 Aug 2004 10:55:47 -0000 1.96 -+++ C/ipkg_cmd.c 11 Sep 2004 19:43:14 -0000 -@@ -860,6 +860,7 @@ - str_list_elt_t *iter; - char *pkg_version; - size_t buff_len = 8192; -+ size_t used_len; - char *buff ; - - buff = (char *)malloc(buff_len); -@@ -891,9 +892,20 @@ - } - #else - if (buff) { -- snprintf(buff, buff_len, "Package %s (%s) is installed on %s and has the following files:\n", -- pkg->name, pkg_version, pkg->dest->name); -+ try_again: -+ used_len = snprintf(buff, buff_len, "Package %s (%s) is installed on %s and has the following files:\n", -+ pkg->name, pkg_version, pkg->dest->name) + 1; -+ if (used_len > buff_len) { -+ buff_len *= 2; -+ buff = realloc (buff, buff_len); -+ goto try_again; -+ } - for (iter = installed_files->head; iter; iter = iter->next) { -+ used_len += strlen (iter->data) + 1; -+ while (buff_len <= used_len) { -+ buff_len *= 2; -+ buff = realloc (buff, buff_len); -+ } - strncat(buff, iter->data, buff_len); - strncat(buff, "\n", buff_len); - } diff --git a/packages/ipkg/ipkg-0.99.130/.mtn2git_empty b/packages/ipkg/ipkg-0.99.130/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/ipkg/ipkg-0.99.130/.mtn2git_empty +++ /dev/null diff --git a/packages/ipkg/ipkg-0.99.130/terse.patch b/packages/ipkg/ipkg-0.99.130/terse.patch deleted file mode 100644 index 9a07df5df3..0000000000 --- a/packages/ipkg/ipkg-0.99.130/terse.patch +++ /dev/null @@ -1,27 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- C/ipkg_cmd.c~terse -+++ C/ipkg_cmd.c -@@ -119,8 +119,6 @@ - " writing status file\n"); - ipkg_conf_write_status_files(conf); - pkg_write_changed_filelists(conf); -- } else { -- ipkg_message(conf, IPKG_NOTICE, "Nothing to be done\n"); - } - } - -@@ -148,9 +146,7 @@ - int result; - p_userdata = userdata; - result = (cmd->fun)(conf, argc, argv); -- if ( result == 0 ) { -- ipkg_message(conf, IPKG_NOTICE, "Successfully terminated.\n"); -- } else { -+ if ( result != 0 ) { - ipkg_message(conf, IPKG_NOTICE, "An error ocurred, return value: %d.\n", result); - } - diff --git a/packages/ipkg/ipkg-0.99.135/.mtn2git_empty b/packages/ipkg/ipkg-0.99.135/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/ipkg/ipkg-0.99.135/.mtn2git_empty +++ /dev/null diff --git a/packages/ipkg/ipkg-0.99.135/depends.patch b/packages/ipkg/ipkg-0.99.135/depends.patch deleted file mode 100644 index 8f472ab405..0000000000 --- a/packages/ipkg/ipkg-0.99.135/depends.patch +++ /dev/null @@ -1,107 +0,0 @@ -Index: ipkg_cmd.c -=================================================================== -RCS file: /cvs/familiar/dist/ipkg/C/ipkg_cmd.c,v -retrieving revision 1.99 -diff -u -r1.99 ipkg_cmd.c ---- ipkg/ipkg_cmd.c 6 Jan 2005 00:21:49 -0000 1.99 -+++ ipkg/ipkg_cmd.c 8 Jan 2005 13:11:16 -0000 -@@ -1150,7 +1150,7 @@ - - int pkg_mark_provides(pkg_t *pkg) - { -- int provides_count = pkg->provides_count; -+ int provides_count = pkg->provides_count + 1; - abstract_pkg_t **provides = pkg->provides; - int i; - pkg->parent->state_flag |= SF_MARKED; -@@ -1207,7 +1207,7 @@ - for (j = 0; j < available_pkgs->len; j++) { - pkg_t *pkg = available_pkgs->pkgs[j]; - int k; -- int count = (what_field_type == WHATPROVIDES) ? pkg->provides_count : pkg->replaces_count; -+ int count = (what_field_type == WHATPROVIDES) ? pkg->provides_count + 1 : pkg->replaces_count; - for (k = 0; k < count; k++) { - abstract_pkg_t *apkg = - ((what_field_type == WHATPROVIDES) -Index: ipkg_remove.c -=================================================================== -RCS file: /cvs/familiar/dist/ipkg/C/ipkg_remove.c,v -retrieving revision 1.40 -diff -u -r1.40 ipkg_remove.c ---- ipkg/ipkg_remove.c 10 May 2004 21:37:07 -0000 1.40 -+++ ipkg/ipkg_remove.c 8 Jan 2005 13:11:19 -0000 -@@ -39,7 +39,7 @@ - */ - int pkg_has_installed_dependents(ipkg_conf_t *conf, abstract_pkg_t *parent_apkg, pkg_t *pkg, abstract_pkg_t *** pdependents) - { -- int nprovides = pkg->provides_count; -+ int nprovides = pkg->provides_count + 1; - abstract_pkg_t **provides = pkg->provides; - int n_installed_dependents = 0; - int i; -Index: pkg_depends.c -=================================================================== -RCS file: /cvs/familiar/dist/ipkg/C/pkg_depends.c,v -retrieving revision 1.61 -diff -u -r1.61 pkg_depends.c ---- ipkg/pkg_depends.c 1 Sep 2004 20:30:39 -0000 1.61 -+++ ipkg/pkg_depends.c 8 Jan 2005 13:11:21 -0000 -@@ -420,9 +420,9 @@ - int pkg_has_common_provides(pkg_t *pkg, pkg_t *replacee) - { - abstract_pkg_t **provides = pkg->provides; -- int provides_count = pkg->provides_count; -+ int provides_count = pkg->provides_count + 1; - abstract_pkg_t **replacee_provides = replacee->provides; -- int replacee_provides_count = replacee->provides_count; -+ int replacee_provides_count = replacee->provides_count + 1; - int i, j; - for (i = 0; i < provides_count; i++) { - abstract_pkg_t *apkg = provides[i]; -@@ -443,7 +443,7 @@ - int pkg_provides_abstract(pkg_t *pkg, abstract_pkg_t *providee) - { - abstract_pkg_t **provides = pkg->provides; -- int provides_count = pkg->provides_count; -+ int provides_count = pkg->provides_count + 1; - int i; - for (i = 0; i < provides_count; i++) { - if (provides[i] == providee) -@@ -461,7 +461,7 @@ - abstract_pkg_t **replaces = pkg->replaces; - int replaces_count = pkg->replaces_count; - abstract_pkg_t **replacee_provides = pkg->provides; -- int replacee_provides_count = pkg->provides_count; -+ int replacee_provides_count = pkg->provides_count + 1; - int i, j; - for (i = 0; i < replaces_count; i++) { - abstract_pkg_t *abstract_replace |