* [ptxdist] Patch cleanup
@ 2011-10-30 22:00 Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
0 siblings, 1 reply; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist
Hi,
I've started to clean up more patches, using git format-patch. This will
make it easier to find patches which need better documentation, add
upstream status etc (more about the exact background soon - we have
started to move the send-patches.org effort forward).
Expect more such series to come.
The following changes since commit 74cb6cb4668b87dac377f915b094d6674b4557f6:
ptxd_lib_kgen: quote find pattern (2011-10-27 19:20:13 +0200)
are available in the git repository at:
git://git.pengutronix.de/git/rsc/ptxdist for-mainline-patchcleanup
Robert Schwebel (28):
canfestival: clean up patches
devicekit-disks: clean up patches
mplayer: clean up patches
policykit: clean up patches
sdl: clean up patches
sdl-mixer: clean up patches
atop: clean up patches
bing: clean up patches
bridge-utils: clean up patches
bzip2: clean up patches
cbmbasic: clean up patches
cpufrequtils: clean up patches
cvs: clean up patches
daemonize: clean up patches
dibbler: clean up patches
e2fsprogs: clean up patches
efax: clean up patches
eggdbus: clean up patches
elektra: remove orphaned package
etherwake: clean up patches
fakeroot: clean up patches
fbtest: clean up patches
font-alias: clean up patches
freetype: clean up patches
glademm: clean up patches
gpsd: clean up patches
gst-plugins-gl: clean up patches
gtk: clean up patches
....diff => 0001-add-DESTDIR-to-Makefile.in.patch} | 165 ++++++-----
...02-fix-for-ldconfig-crash-on-make-install.patch | 28 ++
...ico.diff => 0003-install-networkedit.ico.patch} | 21 +-
...er.diff => 0004-fix-for-CAN-ID-byteorder.patch} | 247 ++++++++--------
patches/CanFestival-3-20081204-1/fix-ldconfig.diff | 24 --
patches/CanFestival-3-20081204-1/series | 4 -
...> 0001-make-sgutils2-dependency-optional.patch} | 18 +-
... 0002-make-libparted-dependency-optional.patch} | 24 +-
... 0003-make-devmapper-dependency-optional.patch} | 22 +-
...004-make-libatasmart-dependency-optional.patch} | 96 ++++---
patches/DeviceKit-disks-009/series | 4 -
...yer-Suport-RGB-frambuffers-in-vo_fbdev.c.patch} | 33 ++-
patches/MPlayer-1.0rc4/series | 1 -
... 0001-compiling-without-pam-doesn-t-work.patch} | 18 +-
.../0002-we-don-t-have-_pk_debug-any-more.patch | 27 ++
.../PolicyKit-0.9/PolicyKit-0.9-no-pk-debug.diff | 23 --
patches/PolicyKit-0.9/series | 2 -
...ff => 0001-SDL-1.2.10-sdl-config.in.diff.patch} | 20 +-
...el-build.diff => 0002-fix-parallel-build.patch} | 17 +-
...fix-ppc-build.diff => 0003-fix-PPC-build.patch} | 14 +-
patches/SDL-1.2.14/series | 3 -
...el-build.diff => 0001-fix-parallel-build.patch} | 23 +-
...g.diff => 0002-fix-cross-compiling-issue.patch} | 14 +-
patches/SDL_mixer-1.2.11/series | 2 -
...mpile.patch => 0001-Fix-crosscompilation.patch} | 18 +-
patches/atop-1.24/series | 1 -
...t-makefile-for-Linux-add-destdir-support.patch} | 20 +-
...g_1.1.3-2.diff => 0002-bing_1.1.3-2.diff.patch} | 50 ++--
patches/bing_src-1.1.3/series | 2 -
...0001-add-dummy-patch-to-enable-autogen.sh.patch | 26 ++
.../bridge-utils-1.5/bridge-utils-1.4-dummy.diff | 18 --
patches/bridge-utils-1.5/series | 1 -
...0.5_Makefile.diff => 0001-fixup-Makefile.patch} | 18 +-
patches/bzip2-1.0.5/series | 1 -
...nd-pseudo-timer-will-give-RND-functional.patch} | 22 +-
patches/cbmbasic/series | 1 -
...m-fix.diff => 0001-build-system-fix.diff.patch} | 19 +-
patches/cpufrequtils-007/series | 1 -
...b.patch => 0001-link-against-system-zlib.patch} | 116 ++++----
patches/cvs-1.11.22/series | 1 -
...-install.diff => 0001-install-to-DESTDIR.patch} | 14 +-
patches/daemonize-1.4/series | 1 -
...ns-search.patch => 0001-merge-dns-search.patch} | 20 +-
.../{fix-compile.patch => 0002-fix-compile.patch} | 20 +-
...uild.patch => 0003-fix-incremental-build.patch} | 22 +-
patches/dibbler-0.7.3/series | 3 -
... => 0001-Fixed-bitops.h-for-Coldfire-V4E.patch} | 17 +-
...linking.diff => 0002-fix-linking-problem.patch} | 18 +-
patches/e2fsprogs-1.41.14/series | 2 -
...efax-0.9-misc.patch => 0001-fix-rd_state.patch} | 14 +-
...lptr.patch => 0002-add-nullpointer-check.patch} | 12 +-
...lines.patch => 0003-fix-l-option-in-efix.patch} | 12 +-
...e.patch => 0004-add-missing-include-file.patch} | 12 +-
patches/efax-0.9/series | 4 -
... => 0001-make-eggdbus-crosscompile-aware.patch} | 28 +-
...uild-tests-only-when-not-cross-compiling.patch} | 18 +-
...ools.diff => 0003-update-autotoolization.patch} | 51 ++--
...6-fix-deps.diff => 0004-fix-dependencies.patch} | 13 +-
patches/eggdbus-0.6/series | 4 -
patches/elektra-0.7.0-r1618/autogen.sh | 1 -
.../elektra-0.7.0-r1618-ini-debug.diff | 29 --
.../elektra-0.7.0rc5-file-existence.diff | 26 --
.../elektra-0.7.0rc5-libxml2.diff | 40 ---
.../elektra-0.7.0rc5-static-libs.diff | 105 -------
patches/elektra-0.7.0-r1618/series | 4 -
....09-1.diff => 0001-etherwake_1.09-1.diff.patch} | 310 ++++++++++++--------
patches/etherwake-1.09.orig/series | 1 -
...d-FAKEROOT_SYSROOT-prefix-for-relocation.patch} | 14 +-
patches/fakeroot-1.14.4/series | 1 -
...e-generated-penguin.c-to-get-rid-of-this.patch} | 71 +++--
...1-nowerror.diff => 0002-Don-t-use-Werror.patch} | 19 +-
...> 0003-Workaround-for-a-gcc-compiler-bug.patch} | 18 +-
...ff => 0004-remove-asm-page.h-use-sysconf.patch} | 24 +-
.../0005-add-install-target.patch | 24 ++
.../fbtest-20041102-1-add-make-install.diff | 20 --
patches/fbtest-20041102-1/series | 5 -
...variable-to-100dpi-and-75dpi-fonts.alias.patch} | 33 ++-
patches/font-alias-1.0.3/series | 1 -
... 0001-make-freetype-config-SYSROOT-aware.patch} | 19 +-
patches/freetype-2.3.11/series | 1 -
...ake-out-double-qualification-of-function.patch} | 18 +-
...0002-make-pkg-config-binary-configurable.patch} | 45 ++--
...-box-with-response-id-will-also-get-packe.patch | 30 ++
...ix-glade-only.diff => 0004-fix-gladeonly.patch} | 29 +-
...> 0005-fix-code-generation-for-Gtk-Table.patch} | 21 +-
...06-fix-code-generation-for-Gtk-Alignment.patch} | 19 +-
...07-add-gettext-to-enable-gettext-support.patch} | 18 +-
...support.diff => 0008-Add-support-for-gwt.patch} | 141 +++++-----
...-namespace-fixes-for-a-stricter-compiler.patch} | 63 +++--
.../box_pack_child_with_responseid.diff | 32 --
patches/glademm-2.6.0/series | 9 -
...01-fix-core-compiling-with-nmea-disabled.patch} | 11 +-
...breakage-if-some-drivers-are-not-enabled.patch} | 22 +-
....diff => 0003-fix-a-simple-compile-error.patch} | 23 +-
...totool-bug.diff => 0004-Fix-autotool-bug.patch} | 18 +-
...rely-on-AM_PATH_PYTHON-to-work-propperly.patch} | 24 +-
...r-python.diff => 0006-fix-parallel-build.patch} | 18 +-
patches/gpsd-2.39/series | 6 -
...ke-sure-gtk-example-builds-for-non-X-gtk.patch} | 18 +-
patches/gst-plugins-gl-0.10.2/series | 1 -
....diff => 0001-gtk-2.10.11-iconcache.diff.patch} | 16 +-
...s.diff => 0002-gtk-2.10.12-no-demos.diff.patch} | 14 +-
patches/gtk+-2.18.7/series | 2 -
rules/elektra.in | 110 -------
rules/elektra.make | 271 -----------------
105 files changed, 1460 insertions(+), 1735 deletions(-)
rename patches/CanFestival-3-20081204-1/{fix-destdir.diff => 0001-add-DESTDIR-to-Makefile.in.patch} (60%)
create mode 100644 patches/CanFestival-3-20081204-1/0002-fix-for-ldconfig-crash-on-make-install.patch
rename patches/CanFestival-3-20081204-1/{install-networkedit_ico.diff => 0003-install-networkedit.ico.patch} (59%)
rename patches/CanFestival-3-20081204-1/{byteorder.diff => 0004-fix-for-CAN-ID-byteorder.patch} (69%)
delete mode 100644 patches/CanFestival-3-20081204-1/fix-ldconfig.diff
delete mode 100644 patches/CanFestival-3-20081204-1/series
rename patches/DeviceKit-disks-009/{libsgutils-optional.diff => 0001-make-sgutils2-dependency-optional.patch} (81%)
rename patches/DeviceKit-disks-009/{libparted-optional.diff => 0002-make-libparted-dependency-optional.patch} (83%)
rename patches/DeviceKit-disks-009/{devmapper-optional.diff => 0003-make-devmapper-dependency-optional.patch} (76%)
rename patches/DeviceKit-disks-009/{smart-optional.diff => 0004-make-libatasmart-dependency-optional.patch} (78%)
delete mode 100644 patches/DeviceKit-disks-009/series
rename patches/MPlayer-1.0rc4/{support_RGB_framebuffer.patch => 0001-MPlayer-Suport-RGB-frambuffers-in-vo_fbdev.c.patch} (74%)
delete mode 100644 patches/MPlayer-1.0rc4/series
rename patches/PolicyKit-0.9/{PolicyKit-0.9-pam-when-disabled.diff => 0001-compiling-without-pam-doesn-t-work.patch} (53%)
create mode 100644 patches/PolicyKit-0.9/0002-we-don-t-have-_pk_debug-any-more.patch
delete mode 100644 patches/PolicyKit-0.9/PolicyKit-0.9-no-pk-debug.diff
delete mode 100644 patches/PolicyKit-0.9/series
rename patches/SDL-1.2.14/{SDL-1.2.10-sdl-config.in.diff => 0001-SDL-1.2.10-sdl-config.in.diff.patch} (80%)
rename patches/SDL-1.2.14/{fix-parallel-build.diff => 0002-fix-parallel-build.patch} (59%)
rename patches/SDL-1.2.14/{fix-ppc-build.diff => 0003-fix-PPC-build.patch} (87%)
delete mode 100644 patches/SDL-1.2.14/series
rename patches/SDL_mixer-1.2.11/{fix-parallel-build.diff => 0001-fix-parallel-build.patch} (83%)
rename patches/SDL_mixer-1.2.11/{fix-cross-compiling.diff => 0002-fix-cross-compiling-issue.patch} (75%)
delete mode 100644 patches/SDL_mixer-1.2.11/series
rename patches/atop-1.24/{fix-cross-compile.patch => 0001-Fix-crosscompilation.patch} (69%)
delete mode 100644 patches/atop-1.24/series
rename patches/bing_src-1.1.3/{adapt_makefile_for_linux.diff => 0001-Adapt-makefile-for-Linux-add-destdir-support.patch} (82%)
rename patches/bing_src-1.1.3/{bing_1.1.3-2.diff => 0002-bing_1.1.3-2.diff.patch} (78%)
delete mode 100644 patches/bing_src-1.1.3/series
create mode 100644 patches/bridge-utils-1.5/0001-add-dummy-patch-to-enable-autogen.sh.patch
delete mode 100644 patches/bridge-utils-1.5/bridge-utils-1.4-dummy.diff
delete mode 100644 patches/bridge-utils-1.5/series
rename patches/bzip2-1.0.5/{bzip2-1.0.5_Makefile.diff => 0001-fixup-Makefile.patch} (96%)
delete mode 100644 patches/bzip2-1.0.5/series
rename patches/cbmbasic/{add_iobase.diff => 0001-Add-IOBASE-and-pseudo-timer-will-give-RND-functional.patch} (61%)
delete mode 100644 patches/cbmbasic/series
rename patches/cpufrequtils-007/{build-system-fix.diff => 0001-build-system-fix.diff.patch} (72%)
delete mode 100644 patches/cpufrequtils-007/series
rename patches/cvs-1.11.22/{cvs-1.11.22-use-system-zlib.patch => 0001-link-against-system-zlib.patch} (76%)
delete mode 100644 patches/cvs-1.11.22/series
rename patches/daemonize-1.4/{fix-destdir-install.diff => 0001-install-to-DESTDIR.patch} (62%)
delete mode 100644 patches/daemonize-1.4/series
rename patches/dibbler-0.7.3/{merge-dns-search.patch => 0001-merge-dns-search.patch} (58%)
rename patches/dibbler-0.7.3/{fix-compile.patch => 0002-fix-compile.patch} (60%)
rename patches/dibbler-0.7.3/{fix-incremental-build.patch => 0003-fix-incremental-build.patch} (59%)
delete mode 100644 patches/dibbler-0.7.3/series
rename patches/e2fsprogs-1.41.14/{coldfire-v4e-compilefix.patch => 0001-Fixed-bitops.h-for-Coldfire-V4E.patch} (63%)
rename patches/e2fsprogs-1.41.14/{fix-libblkid-linking.diff => 0002-fix-linking-problem.patch} (56%)
delete mode 100644 patches/e2fsprogs-1.41.14/series
rename patches/efax-0.9/{efax-0.9-misc.patch => 0001-fix-rd_state.patch} (55%)
rename patches/efax-0.9/{efax-0.9-nullptr.patch => 0002-add-nullpointer-check.patch} (78%)
rename patches/efax-0.9/{efax-0.9-numlines.patch => 0003-fix-l-option-in-efix.patch} (79%)
rename patches/efax-0.9/{efax08a-time.patch => 0004-add-missing-include-file.patch} (53%)
delete mode 100644 patches/efax-0.9/series
rename patches/eggdbus-0.6/{eggdbus-0.6-host-tools.diff => 0001-make-eggdbus-crosscompile-aware.patch} (72%)
rename patches/eggdbus-0.6/{eggdbus-0.6-no-tests.diff => 0002-build-tests-only-when-not-cross-compiling.patch} (69%)
rename patches/eggdbus-0.6/{eggdbus-0.6-autotools.diff => 0003-update-autotoolization.patch} (81%)
rename patches/eggdbus-0.6/{eggdbus-0.6-fix-deps.diff => 0004-fix-dependencies.patch} (67%)
delete mode 100644 patches/eggdbus-0.6/series
delete mode 120000 patches/elektra-0.7.0-r1618/autogen.sh
delete mode 100644 patches/elektra-0.7.0-r1618/elektra-0.7.0-r1618-ini-debug.diff
delete mode 100644 patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-file-existence.diff
delete mode 100644 patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-libxml2.diff
delete mode 100644 patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-static-libs.diff
delete mode 100644 patches/elektra-0.7.0-r1618/series
rename patches/etherwake-1.09.orig/{etherwake_1.09-1.diff => 0001-etherwake_1.09-1.diff.patch} (80%)
delete mode 100644 patches/etherwake-1.09.orig/series
rename patches/fakeroot-1.14.4/{add-sysroot-prefix.diff => 0001-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch} (73%)
delete mode 100644 patches/fakeroot-1.14.4/series
rename patches/fbtest-20041102-1/{fbtest-20041102-1-penguin.diff => 0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch} (98%)
rename patches/fbtest-20041102-1/{fbtest-20041102-1-nowerror.diff => 0002-Don-t-use-Werror.patch} (54%)
rename patches/fbtest-20041102-1/{fbtest-20041102-1-optimize-O2.diff => 0003-Workaround-for-a-gcc-compiler-bug.patch} (78%)
rename patches/fbtest-20041102-1/{fbtest-20041102-1-page_mask.diff => 0004-remove-asm-page.h-use-sysconf.patch} (85%)
create mode 100644 patches/fbtest-20041102-1/0005-add-install-target.patch
delete mode 100644 patches/fbtest-20041102-1/fbtest-20041102-1-add-make-install.diff
delete mode 100644 patches/fbtest-20041102-1/series
rename patches/font-alias-1.0.3/{alias_variable_font_dir.diff => 0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch} (69%)
delete mode 100644 patches/font-alias-1.0.3/series
rename patches/freetype-2.3.11/{builds_unix_freetype-config_in_sysroot.diff => 0001-make-freetype-config-SYSROOT-aware.patch} (84%)
delete mode 100644 patches/freetype-2.3.11/series
rename patches/glademm-2.6.0/{fix_double_qualification.diff => 0001-take-out-double-qualification-of-function.patch} (66%)
rename patches/glademm-2.6.0/{configurable_pkgconfig.diff => 0002-make-pkg-config-binary-configurable.patch} (82%)
create mode 100644 patches/glademm-2.6.0/0003-children-of-box-with-response-id-will-also-get-packe.patch
rename patches/glademm-2.6.0/{fix-glade-only.diff => 0004-fix-gladeonly.patch} (80%)
rename patches/glademm-2.6.0/{fix-table-attach.diff => 0005-fix-code-generation-for-Gtk-Table.patch} (74%)
rename patches/glademm-2.6.0/{fix-alignment-writer.diff => 0006-fix-code-generation-for-Gtk-Alignment.patch} (68%)
rename patches/glademm-2.6.0/{gettext-param.diff => 0007-add-gettext-to-enable-gettext-support.patch} (74%)
rename patches/glademm-2.6.0/{gwt-support.diff => 0008-Add-support-for-gwt.patch} (83%)
rename patches/glademm-2.6.0/{fix-for-new-gcc.diff => 0009-include-and-namespace-fixes-for-a-stricter-compiler.patch} (76%)
delete mode 100644 patches/glademm-2.6.0/box_pack_child_with_responseid.diff
delete mode 100644 patches/glademm-2.6.0/series
rename patches/gpsd-2.39/{gpsd-2.39-fix-core-compiling-with-nmea-disabled.diff => 0001-fix-core-compiling-with-nmea-disabled.patch} (81%)
rename patches/gpsd-2.39/{gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.diff => 0002-fix-link-breakage-if-some-drivers-are-not-enabled.patch} (75%)
rename patches/gpsd-2.39/{gpsd-2.39-fix_build_error.diff => 0003-fix-a-simple-compile-error.patch} (62%)
rename patches/gpsd-2.39/{gpsd-2.39-fix-autotool-bug.diff => 0004-Fix-autotool-bug.patch} (86%)
rename patches/gpsd-2.39/{gpsd-2.39-configure_ac-fix-python.diff => 0005-just-rely-on-AM_PATH_PYTHON-to-work-propperly.patch} (88%)
rename patches/gpsd-2.39/{gpsd-2.39-fixup-parallel-build-for-python.diff => 0006-fix-parallel-build.patch} (75%)
delete mode 100644 patches/gpsd-2.39/series
rename patches/gst-plugins-gl-0.10.2/{disable-broken-example.diff => 0001-make-sure-gtk-example-builds-for-non-X-gtk.patch} (62%)
delete mode 100644 patches/gst-plugins-gl-0.10.2/series
rename patches/gtk+-2.18.7/{gtk+-2.10.11-iconcache.diff => 0001-gtk-2.10.11-iconcache.diff.patch} (66%)
rename patches/gtk+-2.18.7/{gtk+-2.10.12-no-demos.diff => 0002-gtk-2.10.12-no-demos.diff.patch} (51%)
delete mode 100644 patches/gtk+-2.18.7/series
delete mode 100644 rules/elektra.in
delete mode 100644 rules/elektra.make
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 01/28] canfestival: clean up patches
2011-10-30 22:00 [ptxdist] Patch cleanup Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 02/28] devicekit-disks: " Robert Schwebel
` (26 more replies)
0 siblings, 27 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
.../0001-add-DESTDIR-to-Makefile.in.patch | 165 +++++++++++
...02-fix-for-ldconfig-crash-on-make-install.patch | 28 ++
.../0003-install-networkedit.ico.patch | 29 ++
.../0004-fix-for-CAN-ID-byteorder.patch | 302 ++++++++++++++++++++
patches/CanFestival-3-20081204-1/byteorder.diff | 287 -------------------
patches/CanFestival-3-20081204-1/fix-destdir.diff | 154 ----------
patches/CanFestival-3-20081204-1/fix-ldconfig.diff | 24 --
.../install-networkedit_ico.diff | 22 --
patches/CanFestival-3-20081204-1/series | 4 -
9 files changed, 524 insertions(+), 491 deletions(-)
create mode 100644 patches/CanFestival-3-20081204-1/0001-add-DESTDIR-to-Makefile.in.patch
create mode 100644 patches/CanFestival-3-20081204-1/0002-fix-for-ldconfig-crash-on-make-install.patch
create mode 100644 patches/CanFestival-3-20081204-1/0003-install-networkedit.ico.patch
create mode 100644 patches/CanFestival-3-20081204-1/0004-fix-for-CAN-ID-byteorder.patch
delete mode 100644 patches/CanFestival-3-20081204-1/byteorder.diff
delete mode 100644 patches/CanFestival-3-20081204-1/fix-destdir.diff
delete mode 100644 patches/CanFestival-3-20081204-1/fix-ldconfig.diff
delete mode 100644 patches/CanFestival-3-20081204-1/install-networkedit_ico.diff
delete mode 100644 patches/CanFestival-3-20081204-1/series
diff --git a/patches/CanFestival-3-20081204-1/0001-add-DESTDIR-to-Makefile.in.patch b/patches/CanFestival-3-20081204-1/0001-add-DESTDIR-to-Makefile.in.patch
new file mode 100644
index 0000000..11507e9
--- /dev/null
+++ b/patches/CanFestival-3-20081204-1/0001-add-DESTDIR-to-Makefile.in.patch
@@ -0,0 +1,165 @@
+From 5c0af481aaf71fc838c9037e8c9ff1127734c2bc Mon Sep 17 00:00:00 2001
+From: Markus Messmer <mme@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:32:03 +0200
+Subject: [PATCH 1/4] add $(DESTDIR) to Makefile.in
+
+Makefile is not $(DESTDIR) aware, this patch adds some $(DESTDIR)s.
+
+Signed-off-by: Markus Messmer <mme@pengutronix.de>
+---
+ drivers/can_socket/Makefile.in | 4 ++--
+ drivers/timers_unix/Makefile.in | 4 ++--
+ drivers/unix/Makefile.in | 8 ++++----
+ examples/TestMasterMicroMod/Makefile.in | 4 ++--
+ examples/TestMasterSlave/Makefile.in | 4 ++--
+ objdictgen/Makefile.in | 22 +++++++++++-----------
+ src/Makefile.in | 12 ++++++------
+ 7 files changed, 29 insertions(+), 29 deletions(-)
+
+diff --git a/drivers/can_socket/Makefile.in b/drivers/can_socket/Makefile.in
+index 2c94b8c..34ecf1a 100644
+--- a/drivers/can_socket/Makefile.in
++++ b/drivers/can_socket/Makefile.in
+@@ -56,8 +56,8 @@ libcanfestival_$(CAN_DRIVER).so: $(OBJS)
+ $(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $<
+
+ install: libcanfestival_$(CAN_DRIVER).so
+- mkdir -p $(PREFIX)/lib/
+- cp $< $(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ cp $< $(DESTDIR)$(PREFIX)/lib/
+
+ uninstall:
+ rm -f $(TARGET_SOFILES)
+diff --git a/drivers/timers_unix/Makefile.in b/drivers/timers_unix/Makefile.in
+index d2bc080..a5c141d 100644
+--- a/drivers/timers_unix/Makefile.in
++++ b/drivers/timers_unix/Makefile.in
+@@ -48,8 +48,8 @@ driver: $(OBJS)
+ $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
+
+ install:
+- mkdir -p $(PREFIX)/include/canfestival
+- cp $(SRC_HFILES) $(PREFIX)/include/canfestival
++ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
++ cp $(SRC_HFILES) $(DESTDIR)$(PREFIX)/include/canfestival
+
+ uninstall:
+ rm -f $(TARGET_HFILES)
+diff --git a/drivers/unix/Makefile.in b/drivers/unix/Makefile.in
+index 9c92293..f8cc854 100644
+--- a/drivers/unix/Makefile.in
++++ b/drivers/unix/Makefile.in
+@@ -97,10 +97,10 @@ libcanfestival_$(TARGET).a: $(OBJS)
+ $(BINUTILS_PREFIX)ranlib $@
+
+ install: libcanfestival_$(TARGET).a
+- mkdir -p $(PREFIX)/lib/
+- mkdir -p $(PREFIX)/include/canfestival
+- cp libcanfestival_$(TARGET).a $(PREFIX)/lib/
+- cp $(SRC_HFILES) $(PREFIX)/include/canfestival
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
++ cp libcanfestival_$(TARGET).a $(DESTDIR)$(PREFIX)/lib/
++ cp $(SRC_HFILES) $(DESTDIR)$(PREFIX)/include/canfestival
+
+ uninstall:
+ rm -f $(PREFIX)/lib/libcanfestival_$(TARGET).a
+diff --git a/examples/TestMasterMicroMod/Makefile.in b/examples/TestMasterMicroMod/Makefile.in
+index bb15b55..97c3357 100644
+--- a/examples/TestMasterMicroMod/Makefile.in
++++ b/examples/TestMasterMicroMod/Makefile.in
+@@ -74,8 +74,8 @@ mrproper: clean
+ rm -f TestMaster.c
+
+ install: TestMasterMicroMod
+- mkdir -p $(PREFIX)/bin/
+- cp $< $(PREFIX)/bin/
++ mkdir -p $(DESTDIR)$(PREFIX)/bin/
++ cp $< $(DESTDIR)$(PREFIX)/bin/
+
+ uninstall:
+ rm -f $(PREFIX)/bin/TestMasterMicroMod
+diff --git a/examples/TestMasterSlave/Makefile.in b/examples/TestMasterSlave/Makefile.in
+index 862ee35..b8ffd2f 100644
+--- a/examples/TestMasterSlave/Makefile.in
++++ b/examples/TestMasterSlave/Makefile.in
+@@ -87,8 +87,8 @@ mrproper: clean
+ rm -f TestMaster.c
+
+ install: TestMasterSlave
+- mkdir -p $(PREFIX)/bin/
+- cp $< $(PREFIX)/bin/
++ mkdir -p $(DESTDIR)$(PREFIX)/bin/
++ cp $< $(DESTDIR)$(PREFIX)/bin/
+
+ uninstall:
+ rm -f $(PREFIX)/bin/TestMasterSlave
+diff --git a/objdictgen/Makefile.in b/objdictgen/Makefile.in
+index bd9db22..16a0f67 100644
+--- a/objdictgen/Makefile.in
++++ b/objdictgen/Makefile.in
+@@ -35,19 +35,19 @@ gnosis/version.py:
+ rm -rf gnosis_extract
+
+ install: gnosis
+- mkdir -p $(PREFIX)/objdictgen
+- cp -r *.py* config doc doc_index examples gnosis $(PREFIX)/objdictgen
+- chmod -R a+r $(PREFIX)/objdictgen
+- mkdir -p $(PREFIX)/bin
+- ln -sf $(PREFIX)/objdictgen/objdictedit.py $(PREFIX)/bin/objdictedit
+- chmod 755 $(PREFIX)/objdictgen/objdictedit.py
+- ln -sf $(PREFIX)/objdictgen/objdictgen.py $(PREFIX)/bin/objdictgen
+- chmod 755 $(PREFIX)/objdictgen/objdictgen.py
++ mkdir -p $(DESTDIR)$(PREFIX)/objdictgen
++ cp -r *.py* config doc doc_index examples gnosis $(DESTDIR)$(PREFIX)/objdictgen
++ chmod -R a+r $(DESTDIR)$(PREFIX)/objdictgen
++ mkdir -p $(DESTDIR)$(PREFIX)/bin
++ ln -sf $(DESTDIR)$(PREFIX)/objdictgen/objdictedit.py $(DESTDIR)$(PREFIX)/bin/objdictedit
++ chmod 755 $(DESTDIR)$(PREFIX)/objdictgen/objdictedit.py
++ ln -sf $(DESTDIR)$(PREFIX)/objdictgen/objdictgen.py $(DESTDIR)$(PREFIX)/bin/objdictgen
++ chmod 755 $(DESTDIR)$(PREFIX)/objdictgen/objdictgen.py
+
+ uninstall:
+- rm -rf $(PREFIX)/objdictgen
+- rm -f $(PREFIX)/bin/objdictedit
+- rm -f $(PREFIX)/bin/objdictgen
++ rm -rf $(DESTDIR)$(PREFIX)/objdictgen
++ rm -f $(DESTDIR)$(PREFIX)/bin/objdictedit
++ rm -f $(DESTDIR)$(PREFIX)/bin/objdictgen
+
+ clean:
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 3613b92..2212908 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -87,8 +87,8 @@ clean:
+
+ install:
+ $(MAKE) -C $(KERNELDIR) M=$(shell pwd) modules_install
+- mkdir -p $(PREFIX)/include/canfestival
+- cp ../include/*.h $(PREFIX)/include/canfestival
++ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
++ cp ../include/*.h $(DESTDIR)$(PREFIX)/include/canfestival
+
+ uninstall:
+ rm -rf $(PREFIX)/include/canfestival
+@@ -114,10 +114,10 @@ $(TARGET)_%o: %c
+ $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
+
+ install: libcanfestival.a
+- mkdir -p $(PREFIX)/lib/
+- mkdir -p $(PREFIX)/include/canfestival
+- cp libcanfestival.a $(PREFIX)/lib/
+- cp ../include/*.h $(PREFIX)/include/canfestival
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
++ cp libcanfestival.a $(DESTDIR)$(PREFIX)/lib/
++ cp ../include/*.h $(DESTDIR)$(PREFIX)/include/canfestival
+
+ uninstall:
+ rm -f $(PREFIX)/lib/libcanfestival.a
+--
+1.7.7
+
diff --git a/patches/CanFestival-3-20081204-1/0002-fix-for-ldconfig-crash-on-make-install.patch b/patches/CanFestival-3-20081204-1/0002-fix-for-ldconfig-crash-on-make-install.patch
new file mode 100644
index 0000000..12a3578
--- /dev/null
+++ b/patches/CanFestival-3-20081204-1/0002-fix-for-ldconfig-crash-on-make-install.patch
@@ -0,0 +1,28 @@
+From 1067aad885978b1db44b97eb0b46634a9ea4a617 Mon Sep 17 00:00:00 2001
+From: Markus Messmer <mme@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:32:03 +0200
+Subject: [PATCH 2/4] fix for ldconfig crash on make install
+
+Installing fails due to ldconfig failure when running as non root user.
+
+Signed-off-by: Markus Messmer <mme@pengutronix.de>
+---
+ Makefile.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 957281e..bdfff24 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -46,7 +46,7 @@ install: canfestival driver
+ $(MAKE) -C src $@
+ $(MAKE) -C examples $@
+ $(MAKE) -C objdictgen $@
+- ldconfig
++ -ldconfig
+
+ uninstall:
+ $(MAKE) -C drivers $@
+--
+1.7.7
+
diff --git a/patches/CanFestival-3-20081204-1/0003-install-networkedit.ico.patch b/patches/CanFestival-3-20081204-1/0003-install-networkedit.ico.patch
new file mode 100644
index 0000000..4788b5b
--- /dev/null
+++ b/patches/CanFestival-3-20081204-1/0003-install-networkedit.ico.patch
@@ -0,0 +1,29 @@
+From 3d08f69c07069b342562eb16f8a4581347e08dec Mon Sep 17 00:00:00 2001
+From: Markus Messmer <mme@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:32:03 +0200
+Subject: [PATCH 3/4] install networkedit.ico
+
+networkedit.ico does not get installed by default, objdictedit complains about
+it. This patch adds it to the installed files.
+
+Signed-off-by: Markus Messmer <mme@pengutronix.de>
+---
+ objdictgen/Makefile.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/objdictgen/Makefile.in b/objdictgen/Makefile.in
+index 16a0f67..edeac27 100644
+--- a/objdictgen/Makefile.in
++++ b/objdictgen/Makefile.in
+@@ -36,7 +36,7 @@ gnosis/version.py:
+
+ install: gnosis
+ mkdir -p $(DESTDIR)$(PREFIX)/objdictgen
+- cp -r *.py* config doc doc_index examples gnosis $(DESTDIR)$(PREFIX)/objdictgen
++ cp -r *.py* config doc doc_index examples gnosis networkedit.ico $(DESTDIR)$(PREFIX)/objdictgen
+ chmod -R a+r $(DESTDIR)$(PREFIX)/objdictgen
+ mkdir -p $(DESTDIR)$(PREFIX)/bin
+ ln -sf $(DESTDIR)$(PREFIX)/objdictgen/objdictedit.py $(DESTDIR)$(PREFIX)/bin/objdictedit
+--
+1.7.7
+
diff --git a/patches/CanFestival-3-20081204-1/0004-fix-for-CAN-ID-byteorder.patch b/patches/CanFestival-3-20081204-1/0004-fix-for-CAN-ID-byteorder.patch
new file mode 100644
index 0000000..fef5bfe
--- /dev/null
+++ b/patches/CanFestival-3-20081204-1/0004-fix-for-CAN-ID-byteorder.patch
@@ -0,0 +1,302 @@
+From 03b55e440275c4fed7986159cb38581835cd7cbc Mon Sep 17 00:00:00 2001
+From: Markus Messmer <mme@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:32:03 +0200
+Subject: [PATCH 4/4] fix for CAN ID byteorder
+
+The can identifier does not need to get switched when compiling for big endian
+machines.
+
+FIXME rsc: needs to be made architecture independend.
+
+Signed-off-by: Markus Messmer <mme@pengutronix.de>
+---
+ include/objdictdef.h | 4 ++--
+ src/emcy.c | 4 ++--
+ src/lifegrd.c | 4 ++--
+ src/lss.c | 4 ++--
+ src/nmtMaster.c | 2 +-
+ src/nmtSlave.c | 2 +-
+ src/pdo.c | 20 ++++++++++----------
+ src/sdo.c | 10 +++++-----
+ src/states.c | 2 +-
+ src/sync.c | 2 +-
+ 10 files changed, 27 insertions(+), 27 deletions(-)
+
+diff --git a/include/objdictdef.h b/include/objdictdef.h
+index 8361ee6..40ee460 100644
+--- a/include/objdictdef.h
++++ b/include/objdictdef.h
+@@ -118,7 +118,7 @@ typedef const indextable * (*scanIndexOD_t)(UNS16 wIndex, UNS32 * errorCode, ODC
+ /************************** MACROS *********************************/
+
+ /* CANopen usefull helpers */
+-#define GET_NODE_ID(m) (UNS16_LE(m.cob_id) & 0x7f)
+-#define GET_FUNCTION_CODE(m) (UNS16_LE(m.cob_id) >> 7)
++#define GET_NODE_ID(m) (m.cob_id & 0x7f)
++#define GET_FUNCTION_CODE(m) (m.cob_id >> 7)
+
+ #endif /* __objdictdef_h__ */
+diff --git a/src/emcy.c b/src/emcy.c
+index 272442a..0a3ca92 100644
+--- a/src/emcy.c
++++ b/src/emcy.c
+@@ -101,7 +101,7 @@ UNS8 sendEMCY(CO_Data* d, UNS16 errCode, UNS8 errRegister)
+
+ MSG_WAR(0x3051, "sendEMCY", 0);
+
+- m.cob_id = UNS16_LE(*(UNS32*)d->error_cobid);
++ m.cob_id = *(UNS32*)d->error_cobid;
+ m.rtr = NOT_A_REQUEST;
+ m.len = 8;
+ m.data[0] = errCode & 0xFF; /* LSB */
+@@ -239,7 +239,7 @@ void proceedEMCY(CO_Data* d, Message* m)
+ }
+
+ /* post the received EMCY */
+- nodeID = UNS16_LE(m->cob_id) & 0x7F;
++ nodeID = m->cob_id & 0x7F;
+ errCode = m->data[0] | ((UNS16)m->data[1] << 8);
+ errReg = m->data[2];
+ (*d->post_emcy)(d, nodeID, errCode, errReg);
+diff --git a/src/lifegrd.c b/src/lifegrd.c
+index 54b14f3..3a6530b 100644
+--- a/src/lifegrd.c
++++ b/src/lifegrd.c
+@@ -103,7 +103,7 @@ void proceedNODE_GUARD(CO_Data* d, Message* m )
+ {
+ Message msg;
+ UNS16 tmp = *d->bDeviceNodeId + 0x700;
+- msg.cob_id = UNS16_LE(tmp);
++ msg.cob_id = tmp;
+ msg.len = (UNS8)0x01;
+ msg.rtr = 0;
+ msg.data[0] = d->nodeState;
+@@ -180,7 +180,7 @@ void ProducerHearbeatAlarm(CO_Data* d, UNS32 id)
+ ** the node-id of this device.
+ */
+ UNS16 tmp = *d->bDeviceNodeId + 0x700;
+- msg.cob_id = UNS16_LE(tmp);
++ msg.cob_id = tmp;
+ msg.len = (UNS8)0x01;
+ msg.rtr = 0;
+ msg.data[0] = d->nodeState; /* No toggle for heartbeat !*/
+diff --git a/src/lss.c b/src/lss.c
+index 2febb62..d244d36 100644
+--- a/src/lss.c
++++ b/src/lss.c
+@@ -330,7 +330,7 @@ UNS8 sendSlaveLSSMessage(CO_Data* d, UNS8 command,void *dat1,void *dat2)
+ m.len = 8;
+ m.rtr = NOT_A_REQUEST;
+ m.data[0]=command;
+- m.cob_id=UNS16_LE(SLSS_ADRESS);
++ m.cob_id=SLSS_ADRESS;
+
+ /* Tha data sent with the msg depends on the command */
+ switch(command){
+@@ -397,7 +397,7 @@ UNS8 sendMasterLSSMessage(CO_Data* d, UNS8 command,void *dat1,void *dat2)
+ m.len = 8;
+ m.rtr = NOT_A_REQUEST;
+ m.data[0]=command;
+- m.cob_id=UNS16_LE(MLSS_ADRESS);
++ m.cob_id=MLSS_ADRESS;
+
+ /* Tha data sent with the msg depends on the command */
+ switch(command){
+diff --git a/src/nmtMaster.c b/src/nmtMaster.c
+index 22b11c8..9e3a80f 100644
+--- a/src/nmtMaster.c
++++ b/src/nmtMaster.c
+@@ -74,7 +74,7 @@ UNS8 masterSendNMTnodeguard(CO_Data* d, UNS8 nodeId)
+
+ /* message configuration */
+ UNS16 tmp = nodeId | (NODE_GUARD << 7);
+- m.cob_id = UNS16_LE(tmp);
++ m.cob_id = tmp;
+ m.rtr = REQUEST;
+ m.len = 1;
+
+diff --git a/src/nmtSlave.c b/src/nmtSlave.c
+index 0ff2eba..ee6efee 100644
+--- a/src/nmtSlave.c
++++ b/src/nmtSlave.c
+@@ -128,7 +128,7 @@ UNS8 slaveSendBootUp(CO_Data* d)
+ /* message configuration */
+ {
+ UNS16 tmp = NODE_GUARD << 7 | *d->bDeviceNodeId;
+- m.cob_id = UNS16_LE(tmp);
++ m.cob_id = tmp;
+ }
+ m.rtr = NOT_A_REQUEST;
+ m.len = 1;
+diff --git a/src/pdo.c b/src/pdo.c
+index 457c495..c435d7a 100644
+--- a/src/pdo.c
++++ b/src/pdo.c
+@@ -55,7 +55,7 @@ UNS8 buildPDO (CO_Data * d, UNS8 numPdo, Message * pdo)
+ UNS8 offset = 0x00;
+ const UNS8 *pMappingCount = (UNS8 *) TPDO_map->pSubindex[0].pObject;
+
+- pdo->cob_id = UNS16_LE(*(UNS32*)TPDO_com->pSubindex[1].pObject & 0x7FF);
++ pdo->cob_id = *(UNS32*)TPDO_com->pSubindex[1].pObject & 0x7FF;
+ pdo->rtr = NOT_A_REQUEST;
+
+ MSG_WAR (0x3009, " PDO CobId is : ",
+@@ -141,7 +141,7 @@ sendPDOrequest (CO_Data * d, UNS16 RPDOIndex)
+ MSG_WAR (0x3930, "sendPDOrequest cobId is : ", *pwCobId);
+ {
+ Message pdo;
+- pdo.cob_id = UNS16_LE(*pwCobId);
++ pdo.cob_id = *pwCobId;
+ pdo.rtr = REQUEST;
+ pdo.len = 0;
+ return canSend (d->canHandle, &pdo);
+@@ -184,7 +184,7 @@ proceedPDO (CO_Data * d, Message * m)
+
+ status = state2;
+
+- MSG_WAR (0x3935, "proceedPDO, cobID : ", (UNS16_LE(m->cob_id) & 0x7ff));
++ MSG_WAR (0x3935, "proceedPDO, cobID : ", (m->cob_id & 0x7ff));
+ offset = 0x00;
+ numPdo = 0;
+ numMap = 0;
+@@ -211,7 +211,7 @@ proceedPDO (CO_Data * d, Message * m)
+ /* check the CobId coherance */
+ /*pwCobId is the cobId read in the dictionary at the state 3
+ */
+- if (*pwCobId == UNS16_LE(m->cob_id))
++ if (*pwCobId == m->cob_id)
+ {
+ /* The cobId is recognized */
+ status = state4;
+@@ -289,7 +289,7 @@ proceedPDO (CO_Data * d, Message * m)
+
+ MSG_WAR (0x3942,
+ "Variable updated by PDO cobid : ",
+- UNS16_LE(m->cob_id));
++ m->cob_id);
+ MSG_WAR (0x3943, " Mapped at index : ",
+ (*pMappingParameter) >> 16);
+ MSG_WAR (0x3944, " subindex : ",
+@@ -306,7 +306,7 @@ proceedPDO (CO_Data * d, Message * m)
+ } /* end if Donnees */
+ else if ((*m).rtr == REQUEST)
+ {
+- MSG_WAR (0x3946, "Receive a PDO request cobId : ", UNS16_LE(m->cob_id));
++ MSG_WAR (0x3946, "Receive a PDO request cobId : ", m->cob_id);
+ status = state1;
+ offsetObjdict = d->firstIndex->PDO_TRS;
+ lastIndex = d->lastIndex->PDO_TRS;
+@@ -324,7 +324,7 @@ proceedPDO (CO_Data * d, Message * m)
+ pwCobId =
+ (d->objdict +
+ offsetObjdict)->pSubindex[1].pObject;
+- if (*pwCobId == UNS16_LE(m->cob_id))
++ if (*pwCobId == m->cob_id)
+ {
+ status = state4;
+ break;
+@@ -364,7 +364,7 @@ proceedPDO (CO_Data * d, Message * m)
+ /* DS301 do not tell what to do in such a case... */
+ MSG_ERR (0x1947,
+ "Not ready RTR_SYNC TPDO send current data : ",
+- UNS16_LE(m->cob_id));
++ m->cob_id);
+ status = state5;
+ }
+ break;
+@@ -389,7 +389,7 @@ proceedPDO (CO_Data * d, Message * m)
+ /* The requested PDO is not to send on request. So, does
+ nothing. */
+ MSG_WAR (0x2947, "PDO is not to send on request : ",
+- UNS16_LE(m->cob_id));
++ m->cob_id);
+ return 0xFF;
+ }
+
+@@ -690,7 +690,7 @@ _sendPDOevent (CO_Data * d, UNS8 isSyncEvent)
+ case state5: /*Send the pdo */
+ /*store_as_last_message */
+ d->PDO_status[pdoNum].last_message = pdo;
+- MSG_WAR (0x396D, "sendPDO cobId :", UNS16_LE(pdo.cob_id));
++ MSG_WAR (0x396D, "sendPDO cobId :", pdo.cob_id);
+ MSG_WAR (0x396E, " Nb octets : ", pdo.len);
+
+ canSend (d->canHandle, &pdo);
+diff --git a/src/sdo.c b/src/sdo.c
+index 4e26652..1262cf9 100644
+--- a/src/sdo.c
++++ b/src/sdo.c
+@@ -547,7 +547,7 @@ UNS8 sendSDO (CO_Data* d, UNS8 whoami, s_SDO sdo)
+ pwCobId = (UNS32*) d->objdict[offset].pSubindex[1].pObject;
+ }
+ /* message copy for sending */
+- m.cob_id = UNS16_LE(*pwCobId);
++ m.cob_id = *pwCobId;
+ m.rtr = NOT_A_REQUEST;
+ /* the length of SDO must be 8 */
+ m.len = 8;
+@@ -640,7 +640,7 @@ UNS8 proceedSDO (CO_Data* d, Message *m)
+ return 0xFF;
+ }
+ pCobId = (UNS32*) d->objdict[offset].pSubindex[1].pObject;
+- if ( *pCobId == UNS16_LE(m->cob_id) ) {
++ if ( *pCobId == m->cob_id ) {
+ whoami = SDO_SERVER;
+ MSG_WAR(0x3A62, "proceedSDO. I am server. index : ", 0x1200 + j);
+ /* In case of server, the node id of the client may be unknown. So we put the index minus offset */
+@@ -663,7 +663,7 @@ UNS8 proceedSDO (CO_Data* d, Message *m)
+ }
+ /* a) Looking for the cobid received. */
+ pCobId = (UNS32*) d->objdict[offset].pSubindex[2].pObject;
+- if (*pCobId == UNS16_LE(m->cob_id) ) {
++ if (*pCobId == m->cob_id ) {
+ /* b) cobid found, so reading the node id of the server. */
+ pNodeId = (UNS8*) d->objdict[offset].pSubindex[3].pObject;
+ whoami = SDO_CLIENT;
+@@ -682,7 +682,7 @@ UNS8 proceedSDO (CO_Data* d, Message *m)
+
+ /* Test if the size of the SDO is ok */
+ if ( (*m).len != 8) {
+- MSG_ERR(0x1A67, "Error size SDO. CobId : ", UNS16_LE(m->cob_id));
++ MSG_ERR(0x1A67, "Error size SDO. CobId : ", m->cob_id);
+ failedSDO(d, nodeId, whoami, 0, 0, SDOABT_GENERAL_ERROR);
+ return 0xFF;
+ }
+@@ -691,7 +691,7 @@ UNS8 proceedSDO (CO_Data* d, Message *m)
+ MSG_WAR(0x3A68, "I am CLIENT. Received SDO from nodeId : ", nodeId);
+ }
+ else {
+- MSG_WAR(0x3A69, "I am SERVER. Received SDO cobId : ", UNS16_LE(m->cob_id));
++ MSG_WAR(0x3A69, "I am SERVER. Received SDO cobId : ", m->cob_id);
+ }
+
+ /* Testing the command specifier */
+diff --git a/src/states.c b/src/states.c
+index c7d5df7..208dcc9 100644
+--- a/src/states.c
++++ b/src/states.c
+@@ -62,7 +62,7 @@ e_nodeState getState(CO_Data* d)
+ **/
+ void canDispatch(CO_Data* d, Message *m)
+ {
+- UNS16 cob_id = UNS16_LE(m->cob_id);
++ UNS16 cob_id = m->cob_id;
+ switch(cob_id >> 7)
+ {
+ case SYNC: /* can be a SYNC or a EMCY message */
+diff --git a/src/sync.c b/src/sync.c
+index bae1925..7ff65f2 100644
+--- a/src/sync.c
++++ b/src/sync.c
+@@ -131,7 +131,7 @@ UNS8 sendSYNCMessage(CO_Data* d)
+
+ MSG_WAR(0x3001, "sendSYNC ", 0);
+
+- m.cob_id = UNS16_LE(*d->COB_ID_Sync);
++ m.cob_id = *d->COB_ID_Sync;
+ m.rtr = NOT_A_REQUEST;
+ m.len = 0;
+
+--
+1.7.7
+
diff --git a/patches/CanFestival-3-20081204-1/byteorder.diff b/patches/CanFestival-3-20081204-1/byteorder.diff
deleted file mode 100644
index d6bdadd..0000000
--- a/patches/CanFestival-3-20081204-1/byteorder.diff
+++ /dev/null
@@ -1,287 +0,0 @@
-Subject: fix for CAN ID byteorder
-From: Markus Messmer <mme@pengutronix.de>
-
-The can identifier does not need to get switched when compiling for big endian
-machines.
-
-FIXME rsc: needs to be made architecture independend.
-
-Signed-off-by: Markus Messmer <mme@pengutronix.de>
-
----
-# datum: 16.12.08 mme: vielleicht auch nur ein hack der hier funktioniert
-Index: CanFestival-3-20080926/src/nmtMaster.c
-===================================================================
---- CanFestival-3-20080926.orig/src/nmtMaster.c 2008-01-25 19:01:58.000000000 +0100
-+++ CanFestival-3-20080926/src/nmtMaster.c 2008-09-30 16:07:54.000000000 +0200
-@@ -74,7 +74,7 @@
-
- /* message configuration */
- UNS16 tmp = nodeId | (NODE_GUARD << 7);
-- m.cob_id = UNS16_LE(tmp);
-+ m.cob_id = tmp;
- m.rtr = REQUEST;
- m.len = 1;
-
-Index: CanFestival-3-20080926/src/lifegrd.c
-===================================================================
---- CanFestival-3-20080926.orig/src/lifegrd.c 2008-09-30 16:09:57.000000000 +0200
-+++ CanFestival-3-20080926/src/lifegrd.c 2008-09-30 16:10:14.000000000 +0200
-@@ -103,7 +103,7 @@
- {
- Message msg;
- UNS16 tmp = *d->bDeviceNodeId + 0x700;
-- msg.cob_id = UNS16_LE(tmp);
-+ msg.cob_id = tmp;
- msg.len = (UNS8)0x01;
- msg.rtr = 0;
- msg.data[0] = d->nodeState;
-@@ -180,7 +180,7 @@
- ** the node-id of this device.
- */
- UNS16 tmp = *d->bDeviceNodeId + 0x700;
-- msg.cob_id = UNS16_LE(tmp);
-+ msg.cob_id = tmp;
- msg.len = (UNS8)0x01;
- msg.rtr = 0;
- msg.data[0] = d->nodeState; /* No toggle for heartbeat !*/
-Index: CanFestival-3-20080926/src/nmtSlave.c
-===================================================================
---- CanFestival-3-20080926.orig/src/nmtSlave.c 2008-09-30 16:12:04.000000000 +0200
-+++ CanFestival-3-20080926/src/nmtSlave.c 2008-09-30 16:12:13.000000000 +0200
-@@ -128,7 +128,7 @@
- /* message configuration */
- {
- UNS16 tmp = NODE_GUARD << 7 | *d->bDeviceNodeId;
-- m.cob_id = UNS16_LE(tmp);
-+ m.cob_id = tmp;
- }
- m.rtr = NOT_A_REQUEST;
- m.len = 1;
-Index: CanFestival-3-20080926/src/pdo.c
-===================================================================
---- CanFestival-3-20080926.orig/src/pdo.c 2008-09-30 16:10:42.000000000 +0200
-+++ CanFestival-3-20080926/src/pdo.c 2008-09-30 16:17:34.000000000 +0200
-@@ -57,7 +57,7 @@
- UNS8 offset = 0x00;
- const UNS8 *pMappingCount = (UNS8 *) TPDO_map->pSubindex[0].pObject;
-
-- pdo->cob_id = UNS16_LE(*(UNS32*)TPDO_com->pSubindex[1].pObject & 0x7FF);
-+ pdo->cob_id = *(UNS32*)TPDO_com->pSubindex[1].pObject & 0x7FF;
- pdo->rtr = NOT_A_REQUEST;
-
- MSG_WAR (0x3009, " PDO CobId is : ",
-@@ -143,7 +143,7 @@
- MSG_WAR (0x3930, "sendPDOrequest cobId is : ", *pwCobId);
- {
- Message pdo;
-- pdo.cob_id = UNS16_LE(*pwCobId);
-+ pdo.cob_id = *pwCobId;
- pdo.rtr = REQUEST;
- pdo.len = 0;
- return canSend (d->canHandle, &pdo);
-@@ -186,7 +186,7 @@
-
- status = state2;
-
-- MSG_WAR (0x3935, "proceedPDO, cobID : ", (UNS16_LE(m->cob_id) & 0x7ff));
-+ MSG_WAR (0x3935, "proceedPDO, cobID : ", (m->cob_id & 0x7ff));
- offset = 0x00;
- numPdo = 0;
- numMap = 0;
-@@ -213,7 +213,7 @@
- /* check the CobId coherance */
- /*pwCobId is the cobId read in the dictionary at the state 3
- */
-- if (*pwCobId == UNS16_LE(m->cob_id))
-+ if (*pwCobId == m->cob_id)
- {
- /* The cobId is recognized */
- status = state4;
-@@ -291,7 +291,7 @@
-
- MSG_WAR (0x3942,
- "Variable updated by PDO cobid : ",
-- UNS16_LE(m->cob_id));
-+ m->cob_id);
- MSG_WAR (0x3943, " Mapped at index : ",
- (*pMappingParameter) >> 16);
- MSG_WAR (0x3944, " subindex : ",
-@@ -308,7 +308,7 @@
- } /* end if Donnees */
- else if ((*m).rtr == REQUEST)
- {
-- MSG_WAR (0x3946, "Receive a PDO request cobId : ", UNS16_LE(m->cob_id));
-+ MSG_WAR (0x3946, "Receive a PDO request cobId : ", m->cob_id);
- status = state1;
- offsetObjdict = d->firstIndex->PDO_TRS;
- lastIndex = d->lastIndex->PDO_TRS;
-@@ -326,7 +326,7 @@
- pwCobId =
- (d->objdict +
- offsetObjdict)->pSubindex[1].pObject;
-- if (*pwCobId == UNS16_LE(m->cob_id))
-+ if (*pwCobId == m->cob_id)
- {
- status = state4;
- break;
-@@ -366,7 +366,7 @@
- /* DS301 do not tell what to do in such a case... */
- MSG_ERR (0x1947,
- "Not ready RTR_SYNC TPDO send current data : ",
-- UNS16_LE(m->cob_id));
-+ m->cob_id);
- status = state5;
- }
- break;
-@@ -391,7 +391,7 @@
- /* The requested PDO is not to send on request. So, does
- nothing. */
- MSG_WAR (0x2947, "PDO is not to send on request : ",
-- UNS16_LE(m->cob_id));
-+ m->cob_id);
- return 0xFF;
- }
-
-@@ -692,7 +692,7 @@
- case state5: /*Send the pdo */
- /*store_as_last_message */
- d->PDO_status[pdoNum].last_message = pdo;
-- MSG_WAR (0x396D, "sendPDO cobId :", UNS16_LE(pdo.cob_id));
-+ MSG_WAR (0x396D, "sendPDO cobId :", pdo.cob_id);
- MSG_WAR (0x396E, " Nb octets : ", pdo.len);
-
- canSend (d->canHandle, &pdo);
-Index: CanFestival-3-20080926/src/sdo.c
-===================================================================
---- CanFestival-3-20080926.orig/src/sdo.c 2008-09-30 16:10:20.000000000 +0200
-+++ CanFestival-3-20080926/src/sdo.c 2008-09-30 16:13:29.000000000 +0200
-@@ -547,7 +547,7 @@
- pwCobId = (UNS32*) d->objdict[offset].pSubindex[1].pObject;
- }
- /* message copy for sending */
-- m.cob_id = UNS16_LE(*pwCobId);
-+ m.cob_id = *pwCobId;
- m.rtr = NOT_A_REQUEST;
- /* the length of SDO must be 8 */
- m.len = 8;
-@@ -640,7 +640,7 @@
- return 0xFF;
- }
- pCobId = (UNS32*) d->objdict[offset].pSubindex[1].pObject;
-- if ( *pCobId == UNS16_LE(m->cob_id) ) {
-+ if ( *pCobId == m->cob_id ) {
- whoami = SDO_SERVER;
- MSG_WAR(0x3A62, "proceedSDO. I am server. index : ", 0x1200 + j);
- /* In case of server, the node id of the client may be unknown. So we put the index minus offset */
-@@ -663,7 +663,7 @@
- }
- /* a) Looking for the cobid received. */
- pCobId = (UNS32*) d->objdict[offset].pSubindex[2].pObject;
-- if (*pCobId == UNS16_LE(m->cob_id) ) {
-+ if (*pCobId == m->cob_id ) {
- /* b) cobid found, so reading the node id of the server. */
- pNodeId = (UNS8*) d->objdict[offset].pSubindex[3].pObject;
- whoami = SDO_CLIENT;
-@@ -682,7 +682,7 @@
-
- /* Test if the size of the SDO is ok */
- if ( (*m).len != 8) {
-- MSG_ERR(0x1A67, "Error size SDO. CobId : ", UNS16_LE(m->cob_id));
-+ MSG_ERR(0x1A67, "Error size SDO. CobId : ", m->cob_id);
- failedSDO(d, nodeId, whoami, 0, 0, SDOABT_GENERAL_ERROR);
- return 0xFF;
- }
-@@ -691,7 +691,7 @@
- MSG_WAR(0x3A68, "I am CLIENT. Received SDO from nodeId : ", nodeId);
- }
- else {
-- MSG_WAR(0x3A69, "I am SERVER. Received SDO cobId : ", UNS16_LE(m->cob_id));
-+ MSG_WAR(0x3A69, "I am SERVER. Received SDO cobId : ", m->cob_id);
- }
-
- /* Testing the command specifier */
-Index: CanFestival-3-20080926/src/states.c
-===================================================================
---- CanFestival-3-20080926.orig/src/states.c 2008-09-30 16:11:21.000000000 +0200
-+++ CanFestival-3-20080926/src/states.c 2008-09-30 16:11:56.000000000 +0200
-@@ -62,7 +62,7 @@
- **/
- void canDispatch(CO_Data* d, Message *m)
- {
-- UNS16 cob_id = UNS16_LE(m->cob_id);
-+ UNS16 cob_id = m->cob_id;
- switch(cob_id >> 7)
- {
- case SYNC: /* can be a SYNC or a EMCY message */
-Index: CanFestival-3-20080926/src/sync.c
-===================================================================
---- CanFestival-3-20080926.orig/src/sync.c 2008-09-30 16:11:08.000000000 +0200
-+++ CanFestival-3-20080926/src/sync.c 2008-09-30 16:11:16.000000000 +0200
-@@ -131,7 +131,7 @@
-
- MSG_WAR(0x3001, "sendSYNC ", 0);
-
-- m.cob_id = UNS16_LE(*d->COB_ID_Sync);
-+ m.cob_id = *d->COB_ID_Sync;
- m.rtr = NOT_A_REQUEST;
- m.len = 0;
-
-Index: CanFestival-3-20080926/src/emcy.c
-===================================================================
---- CanFestival-3-20080926.orig/src/emcy.c 2008-09-30 16:15:26.000000000 +0200
-+++ CanFestival-3-20080926/src/emcy.c 2008-09-30 16:16:00.000000000 +0200
-@@ -101,7 +101,7 @@
-
- MSG_WAR(0x3051, "sendEMCY", 0);
-
-- m.cob_id = UNS16_LE(*(UNS32*)d->error_cobid);
-+ m.cob_id = *(UNS32*)d->error_cobid;
- m.rtr = NOT_A_REQUEST;
- m.len = 8;
- m.data[0] = errCode & 0xFF; /* LSB */
-@@ -239,7 +239,7 @@
- }
-
- /* post the received EMCY */
-- nodeID = UNS16_LE(m->cob_id) & 0x7F;
-+ nodeID = m->cob_id & 0x7F;
- errCode = m->data[0] | ((UNS16)m->data[1] << 8);
- errReg = m->data[2];
- (*d->post_emcy)(d, nodeID, errCode, errReg);
-Index: CanFestival-3-20080926/src/lss.c
-===================================================================
---- CanFestival-3-20080926.orig/src/lss.c 2008-09-30 16:16:12.000000000 +0200
-+++ CanFestival-3-20080926/src/lss.c 2008-09-30 16:16:34.000000000 +0200
-@@ -330,7 +330,7 @@
- m.len = 8;
- m.rtr = NOT_A_REQUEST;
- m.data[0]=command;
-- m.cob_id=UNS16_LE(SLSS_ADRESS);
-+ m.cob_id=SLSS_ADRESS;
-
- /* Tha data sent with the msg depends on the command */
- switch(command){
-@@ -397,7 +397,7 @@
- m.len = 8;
- m.rtr = NOT_A_REQUEST;
- m.data[0]=command;
-- m.cob_id=UNS16_LE(MLSS_ADRESS);
-+ m.cob_id=MLSS_ADRESS;
-
- /* Tha data sent with the msg depends on the command */
- switch(command){
-Index: CanFestival-3-20080926/include/objdictdef.h
-===================================================================
---- CanFestival-3-20080926.orig/include/objdictdef.h 2008-09-30 16:17:53.000000000 +0200
-+++ CanFestival-3-20080926/include/objdictdef.h 2008-09-30 16:18:09.000000000 +0200
-@@ -118,7 +118,7 @@
- /************************** MACROS *********************************/
-
- /* CANopen usefull helpers */
--#define GET_NODE_ID(m) (UNS16_LE(m.cob_id) & 0x7f)
--#define GET_FUNCTION_CODE(m) (UNS16_LE(m.cob_id) >> 7)
-+#define GET_NODE_ID(m) (m.cob_id & 0x7f)
-+#define GET_FUNCTION_CODE(m) (m.cob_id >> 7)
-
- #endif /* __objdictdef_h__ */
diff --git a/patches/CanFestival-3-20081204-1/fix-destdir.diff b/patches/CanFestival-3-20081204-1/fix-destdir.diff
deleted file mode 100644
index 0b4acf9..0000000
--- a/patches/CanFestival-3-20081204-1/fix-destdir.diff
+++ /dev/null
@@ -1,154 +0,0 @@
-Subject: add $(DESTDIR) to Makefile.in
-From: Markus Messmer <mme@pengutronix.de>
-
-Makefile is not $(DESTDIR) aware, this patch adds some $(DESTDIR)s.
-
-Signed-off-by: Markus Messmer <mme@pengutronix.de>
-
----
-# 20081216 mme: ready for upstream, should be posted
-
-Index: CanFestival-3-20080926/drivers/timers_unix/Makefile.in
-===================================================================
---- CanFestival-3-20080926.orig/drivers/timers_unix/Makefile.in 2008-09-26 12:22:50.000000000 +0200
-+++ CanFestival-3-20080926/drivers/timers_unix/Makefile.in 2008-09-26 12:22:53.000000000 +0200
-@@ -48,8 +48,8 @@
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- install:
-- mkdir -p $(PREFIX)/include/canfestival
-- cp $(SRC_HFILES) $(PREFIX)/include/canfestival
-+ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
-+ cp $(SRC_HFILES) $(DESTDIR)$(PREFIX)/include/canfestival
-
- uninstall:
- rm -f $(TARGET_HFILES)
-Index: CanFestival-3-20080926/drivers/can_socket/Makefile.in
-===================================================================
---- CanFestival-3-20080926.orig/drivers/can_socket/Makefile.in 2008-09-26 12:22:50.000000000 +0200
-+++ CanFestival-3-20080926/drivers/can_socket/Makefile.in 2008-09-26 12:22:53.000000000 +0200
-@@ -56,8 +56,8 @@
- $(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $<
-
- install: libcanfestival_$(CAN_DRIVER).so
-- mkdir -p $(PREFIX)/lib/
-- cp $< $(PREFIX)/lib/
-+ mkdir -p $(DESTDIR)$(PREFIX)/lib/
-+ cp $< $(DESTDIR)$(PREFIX)/lib/
-
- uninstall:
- rm -f $(TARGET_SOFILES)
-Index: CanFestival-3-20080926/drivers/unix/Makefile.in
-===================================================================
---- CanFestival-3-20080926.orig/drivers/unix/Makefile.in 2008-09-26 12:22:50.000000000 +0200
-+++ CanFestival-3-20080926/drivers/unix/Makefile.in 2008-09-26 12:22:53.000000000 +0200
-@@ -97,10 +97,10 @@
- $(BINUTILS_PREFIX)ranlib $@
-
- install: libcanfestival_$(TARGET).a
-- mkdir -p $(PREFIX)/lib/
-- mkdir -p $(PREFIX)/include/canfestival
-- cp libcanfestival_$(TARGET).a $(PREFIX)/lib/
-- cp $(SRC_HFILES) $(PREFIX)/include/canfestival
-+ mkdir -p $(DESTDIR)$(PREFIX)/lib/
-+ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
-+ cp libcanfestival_$(TARGET).a $(DESTDIR)$(PREFIX)/lib/
-+ cp $(SRC_HFILES) $(DESTDIR)$(PREFIX)/include/canfestival
-
- uninstall:
- rm -f $(PREFIX)/lib/libcanfestival_$(TARGET).a
-Index: CanFestival-3-20080926/src/Makefile.in
-===================================================================
---- CanFestival-3-20080926.orig/src/Makefile.in 2008-09-26 12:22:50.000000000 +0200
-+++ CanFestival-3-20080926/src/Makefile.in 2008-09-26 12:22:53.000000000 +0200
-@@ -87,8 +87,8 @@
-
- install:
- $(MAKE) -C $(KERNELDIR) M=$(shell pwd) modules_install
-- mkdir -p $(PREFIX)/include/canfestival
-- cp ../include/*.h $(PREFIX)/include/canfestival
-+ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
-+ cp ../include/*.h $(DESTDIR)$(PREFIX)/include/canfestival
-
- uninstall:
- rm -rf $(PREFIX)/include/canfestival
-@@ -114,10 +114,10 @@
- $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-
- install: libcanfestival.a
-- mkdir -p $(PREFIX)/lib/
-- mkdir -p $(PREFIX)/include/canfestival
-- cp libcanfestival.a $(PREFIX)/lib/
-- cp ../include/*.h $(PREFIX)/include/canfestival
-+ mkdir -p $(DESTDIR)$(PREFIX)/lib/
-+ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
-+ cp libcanfestival.a $(DESTDIR)$(PREFIX)/lib/
-+ cp ../include/*.h $(DESTDIR)$(PREFIX)/include/canfestival
-
- uninstall:
- rm -f $(PREFIX)/lib/libcanfestival.a
-Index: CanFestival-3-20080926/examples/TestMasterSlave/Makefile.in
-===================================================================
---- CanFestival-3-20080926.orig/examples/TestMasterSlave/Makefile.in 2008-09-26 12:22:50.000000000 +0200
-+++ CanFestival-3-20080926/examples/TestMasterSlave/Makefile.in 2008-09-26 12:22:53.000000000 +0200
-@@ -87,8 +87,8 @@
- rm -f TestMaster.c
-
- install: TestMasterSlave
-- mkdir -p $(PREFIX)/bin/
-- cp $< $(PREFIX)/bin/
-+ mkdir -p $(DESTDIR)$(PREFIX)/bin/
-+ cp $< $(DESTDIR)$(PREFIX)/bin/
-
- uninstall:
- rm -f $(PREFIX)/bin/TestMasterSlave
-Index: CanFestival-3-20080926/examples/TestMasterMicroMod/Makefile.in
-===================================================================
---- CanFestival-3-20080926.orig/examples/TestMasterMicroMod/Makefile.in 2008-09-26 12:22:50.000000000 +0200
-+++ CanFestival-3-20080926/examples/TestMasterMicroMod/Makefile.in 2008-09-26 12:22:53.000000000 +0200
-@@ -74,8 +74,8 @@
- rm -f TestMaster.c
-
- install: TestMasterMicroMod
-- mkdir -p $(PREFIX)/bin/
-- cp $< $(PREFIX)/bin/
-+ mkdir -p $(DESTDIR)$(PREFIX)/bin/
-+ cp $< $(DESTDIR)$(PREFIX)/bin/
-
- uninstall:
- rm -f $(PREFIX)/bin/TestMasterMicroMod
-Index: CanFestival-3-20080926/objdictgen/Makefile.in
-===================================================================
---- CanFestival-3-20080926.orig/objdictgen/Makefile.in 2008-09-26 12:22:50.000000000 +0200
-+++ CanFestival-3-20080926/objdictgen/Makefile.in 2008-09-26 12:24:52.000000000 +0200
-@@ -35,19 +35,19 @@
- rm -rf gnosis_extract
-
- install: gnosis
-- mkdir -p $(PREFIX)/objdictgen
-- cp -r *.py* config doc doc_index examples gnosis $(PREFIX)/objdictgen
-- chmod -R a+r $(PREFIX)/objdictgen
-- mkdir -p $(PREFIX)/bin
-- ln -sf $(PREFIX)/objdictgen/objdictedit.py $(PREFIX)/bin/objdictedit
-- chmod 755 $(PREFIX)/objdictgen/objdictedit.py
-- ln -sf $(PREFIX)/objdictgen/objdictgen.py $(PREFIX)/bin/objdictgen
-- chmod 755 $(PREFIX)/objdictgen/objdictgen.py
-+ mkdir -p $(DESTDIR)$(PREFIX)/objdictgen
-+ cp -r *.py* config doc doc_index examples gnosis $(DESTDIR)$(PREFIX)/objdictgen
-+ chmod -R a+r $(DESTDIR)$(PREFIX)/objdictgen
-+ mkdir -p $(DESTDIR)$(PREFIX)/bin
-+ ln -sf $(DESTDIR)$(PREFIX)/objdictgen/objdictedit.py $(DESTDIR)$(PREFIX)/bin/objdictedit
-+ chmod 755 $(DESTDIR)$(PREFIX)/objdictgen/objdictedit.py
-+ ln -sf $(DESTDIR)$(PREFIX)/objdictgen/objdictgen.py $(DESTDIR)$(PREFIX)/bin/objdictgen
-+ chmod 755 $(DESTDIR)$(PREFIX)/objdictgen/objdictgen.py
-
- uninstall:
-- rm -rf $(PREFIX)/objdictgen
-- rm -f $(PREFIX)/bin/objdictedit
-- rm -f $(PREFIX)/bin/objdictgen
-+ rm -rf $(DESTDIR)$(PREFIX)/objdictgen
-+ rm -f $(DESTDIR)$(PREFIX)/bin/objdictedit
-+ rm -f $(DESTDIR)$(PREFIX)/bin/objdictgen
-
- clean:
-
diff --git a/patches/CanFestival-3-20081204-1/fix-ldconfig.diff b/patches/CanFestival-3-20081204-1/fix-ldconfig.diff
deleted file mode 100644
index bdb6d16..0000000
--- a/patches/CanFestival-3-20081204-1/fix-ldconfig.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Subject: fix for ldconfig crash on make install
-From: Markus Messmer <mme@pengutronix.de>
-
-Installing fails due to ldconfig failure when running as non root user.
-
-Signed-off-by: Markus Messmer <mme@pengutronix.de>
-
----
-
-# 20081216 mme: this is only a hack, not for upstream
-
-Index: CanFestival-3-20080926/Makefile.in
-===================================================================
---- CanFestival-3-20080926.orig/Makefile.in 2008-09-26 11:39:51.000000000 +0200
-+++ CanFestival-3-20080926/Makefile.in 2008-09-26 11:39:59.000000000 +0200
-@@ -46,7 +46,7 @@
- $(MAKE) -C src $@
- $(MAKE) -C examples $@
- $(MAKE) -C objdictgen $@
-- ldconfig
-+ -ldconfig
-
- uninstall:
- $(MAKE) -C drivers $@
diff --git a/patches/CanFestival-3-20081204-1/install-networkedit_ico.diff b/patches/CanFestival-3-20081204-1/install-networkedit_ico.diff
deleted file mode 100644
index 5111fd3..0000000
--- a/patches/CanFestival-3-20081204-1/install-networkedit_ico.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Subject: install networkedit.ico
-From: Markus Messmer <mme@pengutronix.de>
-
-networkedit.ico does not get installed by default, objdictedit complains about
-it. This patch adds it to the installed files.
-
-Signed-off-by: Markus Messmer <mme@pengutronix.de>
-
----
-Index: CanFestival-3-20080926/objdictgen/Makefile.in
-===================================================================
---- CanFestival-3-20080926.orig/objdictgen/Makefile.in 2008-09-26 12:26:30.000000000 +0200
-+++ CanFestival-3-20080926/objdictgen/Makefile.in 2008-09-26 12:27:58.000000000 +0200
-@@ -36,7 +36,7 @@
-
- install: gnosis
- mkdir -p $(DESTDIR)$(PREFIX)/objdictgen
-- cp -r *.py* config doc doc_index examples gnosis $(DESTDIR)$(PREFIX)/objdictgen
-+ cp -r *.py* config doc doc_index examples gnosis networkedit.ico $(DESTDIR)$(PREFIX)/objdictgen
- chmod -R a+r $(DESTDIR)$(PREFIX)/objdictgen
- mkdir -p $(DESTDIR)$(PREFIX)/bin
- ln -sf $(DESTDIR)$(PREFIX)/objdictgen/objdictedit.py $(DESTDIR)$(PREFIX)/bin/objdictedit
diff --git a/patches/CanFestival-3-20081204-1/series b/patches/CanFestival-3-20081204-1/series
deleted file mode 100644
index 5f5db88..0000000
--- a/patches/CanFestival-3-20081204-1/series
+++ /dev/null
@@ -1,4 +0,0 @@
-fix-destdir.diff
-fix-ldconfig.diff
-install-networkedit_ico.diff
-byteorder.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 02/28] devicekit-disks: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 03/28] mplayer: " Robert Schwebel
` (25 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
.../0001-make-sgutils2-dependency-optional.patch | 70 +++++
.../0002-make-libparted-dependency-optional.patch | 99 +++++++
.../0003-make-devmapper-dependency-optional.patch | 65 +++++
...0004-make-libatasmart-dependency-optional.patch | 273 ++++++++++++++++++++
.../DeviceKit-disks-009/devmapper-optional.diff | 61 -----
.../DeviceKit-disks-009/libparted-optional.diff | 95 -------
.../DeviceKit-disks-009/libsgutils-optional.diff | 66 -----
patches/DeviceKit-disks-009/series | 4 -
patches/DeviceKit-disks-009/smart-optional.diff | 269 -------------------
9 files changed, 507 insertions(+), 495 deletions(-)
create mode 100644 patches/DeviceKit-disks-009/0001-make-sgutils2-dependency-optional.patch
create mode 100644 patches/DeviceKit-disks-009/0002-make-libparted-dependency-optional.patch
create mode 100644 patches/DeviceKit-disks-009/0003-make-devmapper-dependency-optional.patch
create mode 100644 patches/DeviceKit-disks-009/0004-make-libatasmart-dependency-optional.patch
delete mode 100644 patches/DeviceKit-disks-009/devmapper-optional.diff
delete mode 100644 patches/DeviceKit-disks-009/libparted-optional.diff
delete mode 100644 patches/DeviceKit-disks-009/libsgutils-optional.diff
delete mode 100644 patches/DeviceKit-disks-009/series
delete mode 100644 patches/DeviceKit-disks-009/smart-optional.diff
diff --git a/patches/DeviceKit-disks-009/0001-make-sgutils2-dependency-optional.patch b/patches/DeviceKit-disks-009/0001-make-sgutils2-dependency-optional.patch
new file mode 100644
index 0000000..e098137
--- /dev/null
+++ b/patches/DeviceKit-disks-009/0001-make-sgutils2-dependency-optional.patch
@@ -0,0 +1,70 @@
+From 8958e6ad70786ae3732c733662e3a1615c2b07f7 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:38:26 +0200
+Subject: [PATCH 1/4] make sgutils2 dependency optional
+
+This patch adds a configure option for sgutils2.
+When disabled, the helper program using it will not be built.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.ac | 21 +++++++++++++--------
+ src/Makefile.am | 5 ++++-
+ 2 files changed, 17 insertions(+), 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 48d3320..e1888bd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -109,15 +109,20 @@ if test "x$GCC" = "xyes"; then
+ changequote([,])dnl
+ fi
+
+-have_sgutils="false"
+-AC_CHECK_LIB([sgutils2], [sg_ll_inquiry], have_sgutils="true")
+-if test x$have_sgutils != "xtrue"; then
+- AC_MSG_ERROR([libsgutils2 is needed])
++AC_ARG_ENABLE(sgutils2, [ --disable-sgutils2],enable_sgutils2=$enableval,enable_sgutils2=yes)
++
++if test "x$enable_sgutils2" = xyes; then
++ have_sgutils="false"
++ AC_CHECK_LIB([sgutils2], [sg_ll_inquiry], have_sgutils="true")
++ if test x$have_sgutils != "xtrue"; then
++ AC_MSG_ERROR([libsgutils2 is needed])
++ fi
++ SGUTILS_CFLAGS=""
++ SGUTILS_LIBS="-lsgutils2"
++ AC_SUBST(SGUTILS_CFLAGS)
++ AC_SUBST(SGUTILS_LIBS)
+ fi
+-SGUTILS_CFLAGS=""
+-SGUTILS_LIBS="-lsgutils2"
+-AC_SUBST(SGUTILS_CFLAGS)
+-AC_SUBST(SGUTILS_LIBS)
++AM_CONDITIONAL(SGUTILS2_ENABLED, test "x$enable_sgutils2" = xyes)
+
+
+ PKG_CHECK_MODULES(GUDEV, [gudev-1.0 >= 001])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 2d9a0c2..5eb4547 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -85,11 +85,14 @@ libexec_PROGRAMS += devkit-disks-helper-mkfs \
+ devkit-disks-helper-fstab-mounter \
+ devkit-disks-helper-ata-smart-collect \
+ devkit-disks-helper-ata-smart-selftest \
+- devkit-disks-helper-drive-detach \
+ devkit-disks-helper-drive-poll \
+ devkit-disks-helper-linux-md-check \
+ $(NULL)
+
++if SGUTILS2_ENABLED
++libexec_PROGRAMS += devkit-disks-helper-drive-detach
++endif
++
+ libexec_SCRIPTS = devkit-disks-helper-change-luks-password
+
+ devkit_disks_helper_mkfs_SOURCES = job-shared.h job-mkfs.c
+--
+1.7.7
+
diff --git a/patches/DeviceKit-disks-009/0002-make-libparted-dependency-optional.patch b/patches/DeviceKit-disks-009/0002-make-libparted-dependency-optional.patch
new file mode 100644
index 0000000..521adb6
--- /dev/null
+++ b/patches/DeviceKit-disks-009/0002-make-libparted-dependency-optional.patch
@@ -0,0 +1,99 @@
+From 841dca181b02157643d0cfe1218a240f9bc847e6 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:38:26 +0200
+Subject: [PATCH 2/4] make libparted dependency optional
+
+This patch adds a configure option for libparted.
+When disabled, the helper programs using it will not be built.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.ac | 11 ++++++++---
+ src/Makefile.am | 18 +++++++++++++-----
+ 2 files changed, 21 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e1888bd..fc99275 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -153,9 +153,14 @@ PKG_CHECK_MODULES(POLKIT_BACKEND_1, [polkit-backend-1 >= 0.92])
+ AC_SUBST(POLKIT_BACKEND_1_CFLAGS)
+ AC_SUBST(POLKIT_BACKEND_1_LIBS)
+
+-PKG_CHECK_MODULES(LIBPARTED, [libparted >= 1.8.8])
+-AC_SUBST(LIBPARTED_CFLAGS)
+-AC_SUBST(LIBPARTED_LIBS)
++AC_ARG_ENABLE(libparted,[ --disable-libparted],enable_libparted=$enableval,enable_libparted=yes)
++
++if test "x$enable_libparted" = xyes; then
++ PKG_CHECK_MODULES(LIBPARTED, [libparted >= 1.8.8])
++ AC_SUBST(LIBPARTED_CFLAGS)
++ AC_SUBST(LIBPARTED_LIBS)
++fi
++AM_CONDITIONAL(LIBPARTED_ENABLED, test "x$enable_libparted" = xyes)
+
+ PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
+ AC_SUBST(DEVMAPPER_CFLAGS)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 5eb4547..51fa699 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -70,16 +70,14 @@ devkit_disks_daemon_LDADD = \
+ $(LIBATASMART_LIBS) \
+ $(NULL)
+
++if LIBPARTED_ENABLED
+ noinst_LTLIBRARIES = libpartutil.la
+ libpartutil_la_SOURCES = partutil.h partutil.c
+ libpartutil_la_CPPFLAGS = $(LIBPARTED_CFLAGS)
+ libpartutil_la_LIBADD = $(LIBPARTED_LIBS)
++endif
+
+ libexec_PROGRAMS += devkit-disks-helper-mkfs \
+- devkit-disks-helper-delete-partition \
+- devkit-disks-helper-create-partition \
+- devkit-disks-helper-modify-partition \
+- devkit-disks-helper-create-partition-table \
+ devkit-disks-helper-change-filesystem-label \
+ devkit-disks-helper-linux-md-remove-component \
+ devkit-disks-helper-fstab-mounter \
+@@ -99,6 +97,12 @@ devkit_disks_helper_mkfs_SOURCES = job-shared.h job-mkfs.c
+ devkit_disks_helper_mkfs_CPPFLAGS = $(AM_CPPFLAGS)
+ devkit_disks_helper_mkfs_LDADD = $(GLIB_LIBS)
+
++if LIBPARTED_ENABLED
++libexec_PROGRAMS += devkit-disks-helper-delete-partition \
++ devkit-disks-helper-create-partition \
++ devkit-disks-helper-modify-partition \
++ devkit-disks-helper-create-partition-table \
++ $(NULL)
+ devkit_disks_helper_delete_partition_SOURCES = job-shared.h job-delete-partition.c
+ devkit_disks_helper_delete_partition_CPPFLAGS = $(AM_CPPFLAGS)
+ devkit_disks_helper_delete_partition_LDADD = $(GLIB_LIBS) libpartutil.la
+@@ -114,6 +118,7 @@ devkit_disks_helper_modify_partition_LDADD = $(GLIB_LIBS) libpartutil.la
+ devkit_disks_helper_create_partition_table_SOURCES = job-shared.h job-create-partition-table.c
+ devkit_disks_helper_create_partition_table_CPPFLAGS = $(AM_CPPFLAGS)
+ devkit_disks_helper_create_partition_table_LDADD = $(GLIB_LIBS) libpartutil.la
++endif
+
+ devkit_disks_helper_change_filesystem_label_SOURCES = job-shared.h job-change-filesystem-label.c
+ devkit_disks_helper_change_filesystem_label_CPPFLAGS = $(AM_CPPFLAGS)
+@@ -149,11 +154,14 @@ devkit_disks_helper_drive_poll_LDADD = $(GLIB_LIBS)
+
+ # TODO: move to udev
+ udevhelperdir = $(slashlibdir)/udev
+-udevhelper_PROGRAMS = devkit-disks-part-id devkit-disks-dm-export devkit-disks-probe-ata-smart
++udevhelper_PROGRAMS = devkit-disks-dm-export devkit-disks-probe-ata-smart
+
++if LIBPARTED_ENABLED
++udevhelper_PROGRAMS += devkit-disks-part-id
+ devkit_disks_part_id_SOURCES = part-id.c
+ devkit_disks_part_id_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUDEV_CFLAGS)
+ devkit_disks_part_id_LDADD = $(GLIB_LIBS) $(LIBUDEV_LIBS) libpartutil.la
++endif
+
+ devkit_disks_dm_export_SOURCES = devkit-disks-dm-export.c
+ devkit_disks_dm_export_CPPFLAGS = $(AM_CPPFLAGS) $(DEVMAPPER_CFLAGS)
+--
+1.7.7
+
diff --git a/patches/DeviceKit-disks-009/0003-make-devmapper-dependency-optional.patch b/patches/DeviceKit-disks-009/0003-make-devmapper-dependency-optional.patch
new file mode 100644
index 0000000..80a475e
--- /dev/null
+++ b/patches/DeviceKit-disks-009/0003-make-devmapper-dependency-optional.patch
@@ -0,0 +1,65 @@
+From 4978e00d595d043893437b6b58c48926e9ab6fdc Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:38:26 +0200
+Subject: [PATCH 3/4] make devmapper dependency optional
+
+This patch adds a configure option for devmapper.
+When disabled, the helper program using it will not be built.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.ac | 11 ++++++++---
+ src/Makefile.am | 5 ++++-
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fc99275..751cea7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -162,9 +162,14 @@ if test "x$enable_libparted" = xyes; then
+ fi
+ AM_CONDITIONAL(LIBPARTED_ENABLED, test "x$enable_libparted" = xyes)
+
+-PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
+-AC_SUBST(DEVMAPPER_CFLAGS)
+-AC_SUBST(DEVMAPPER_LIBS)
++AC_ARG_ENABLE(devmapper,[ --disable-devmapper],enable_devmapper=$enableval,enable_devmapper=yes)
++
++if test "x$enable_devmapper" = xyes; then
++ PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
++ AC_SUBST(DEVMAPPER_CFLAGS)
++ AC_SUBST(DEVMAPPER_LIBS)
++fi
++AM_CONDITIONAL(DEVMAPPER_ENABLED, test "x$enable_devmapper" = xyes)
+
+ PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
+ AC_SUBST(LIBATASMART_CFLAGS)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 51fa699..db15102 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -154,7 +154,7 @@ devkit_disks_helper_drive_poll_LDADD = $(GLIB_LIBS)
+
+ # TODO: move to udev
+ udevhelperdir = $(slashlibdir)/udev
+-udevhelper_PROGRAMS = devkit-disks-dm-export devkit-disks-probe-ata-smart
++udevhelper_PROGRAMS = devkit-disks-probe-ata-smart
+
+ if LIBPARTED_ENABLED
+ udevhelper_PROGRAMS += devkit-disks-part-id
+@@ -163,9 +163,12 @@ devkit_disks_part_id_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUDEV_CFLAGS)
+ devkit_disks_part_id_LDADD = $(GLIB_LIBS) $(LIBUDEV_LIBS) libpartutil.la
+ endif
+
++if DEVMAPPER_ENABLED
++udevhelper_PROGRAMS += devkit-disks-dm-export
+ devkit_disks_dm_export_SOURCES = devkit-disks-dm-export.c
+ devkit_disks_dm_export_CPPFLAGS = $(AM_CPPFLAGS) $(DEVMAPPER_CFLAGS)
+ devkit_disks_dm_export_LDADD = $(DEVMAPPER_LIBS)
++endif
+
+ devkit_disks_probe_ata_smart_SOURCES = devkit-disks-probe-ata-smart.c
+ devkit_disks_probe_ata_smart_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS)
+--
+1.7.7
+
diff --git a/patches/DeviceKit-disks-009/0004-make-libatasmart-dependency-optional.patch b/patches/DeviceKit-disks-009/0004-make-libatasmart-dependency-optional.patch
new file mode 100644
index 0000000..589a991
--- /dev/null
+++ b/patches/DeviceKit-disks-009/0004-make-libatasmart-dependency-optional.patch
@@ -0,0 +1,273 @@
+From da26752d7cd524b45e2da8ac46b03e733872c1a6 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:38:26 +0200
+Subject: [PATCH 4/4] make libatasmart dependency optional
+
+This patch adds a configure option for libatasmart.
+When disabled, the helper programs using it will not be built.
+Any other code using libatasmart is guarded with appropriate ifdefs.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.ac | 12 +++++++++---
+ src/Makefile.am | 12 +++++++++---
+ src/devkit-disks-device-private.c | 2 ++
+ src/devkit-disks-device-private.h | 6 ++++++
+ src/devkit-disks-device.c | 12 ++++++++++++
+ tools/devkit-disks.c | 6 ++++++
+ 6 files changed, 44 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 751cea7..94cf4fd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -171,9 +171,15 @@ if test "x$enable_devmapper" = xyes; then
+ fi
+ AM_CONDITIONAL(DEVMAPPER_ENABLED, test "x$enable_devmapper" = xyes)
+
+-PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
+-AC_SUBST(LIBATASMART_CFLAGS)
+-AC_SUBST(LIBATASMART_LIBS)
++AC_ARG_ENABLE(libatasmart,[ --disable-libatasmart],enable_libatasmart=$enableval,enable_libatasmart=yes)
++
++if test "x$enable_libatasmart" = xyes; then
++ PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
++ AC_SUBST(LIBATASMART_CFLAGS)
++ AC_SUBST(LIBATASMART_LIBS)
++ AC_DEFINE(LIBATASMART_ENABLED,[1],[libatasmart enabled])
++fi
++AM_CONDITIONAL(LIBATASMART_ENABLED, test "x$enable_libatasmart" = xyes)
+
+ PKG_CHECK_MODULES(LIBUDEV, [libudev >= 142])
+ AC_SUBST(LIBUDEV_CFLAGS)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index db15102..a967dbb 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -81,8 +81,6 @@ libexec_PROGRAMS += devkit-disks-helper-mkfs \
+ devkit-disks-helper-change-filesystem-label \
+ devkit-disks-helper-linux-md-remove-component \
+ devkit-disks-helper-fstab-mounter \
+- devkit-disks-helper-ata-smart-collect \
+- devkit-disks-helper-ata-smart-selftest \
+ devkit-disks-helper-drive-poll \
+ devkit-disks-helper-linux-md-check \
+ $(NULL)
+@@ -124,6 +122,10 @@ devkit_disks_helper_change_filesystem_label_SOURCES = job-shared.h job-change-fi
+ devkit_disks_helper_change_filesystem_label_CPPFLAGS = $(AM_CPPFLAGS)
+ devkit_disks_helper_change_filesystem_label_LDADD = $(GLIB_LIBS)
+
++if LIBATASMART_ENABLED
++libexec_PROGRAMS += devkit-disks-helper-ata-smart-collect \
++ devkit-disks-helper-ata-smart-selftest \
++ $(NULL)
+ devkit_disks_helper_ata_smart_selftest_SOURCES = job-shared.h job-ata-smart-selftest.c
+ devkit_disks_helper_ata_smart_selftest_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS) $(GLIB_CFLAGS)
+ devkit_disks_helper_ata_smart_selftest_LDADD = $(LIBATASMART_LIBS) $(GLIB_LIBS)
+@@ -131,6 +133,7 @@ devkit_disks_helper_ata_smart_selftest_LDADD = $(LIBATASMART_LIBS) $(GLIB_LIBS)
+ devkit_disks_helper_ata_smart_collect_SOURCES = job-ata-smart-collect.c
+ devkit_disks_helper_ata_smart_collect_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS) $(GLIB_CFLAGS)
+ devkit_disks_helper_ata_smart_collect_LDADD = $(LIBATASMART_LIBS) $(GLIB_LIBS)
++endif
+
+ devkit_disks_helper_linux_md_remove_component_SOURCES = job-shared.h job-linux-md-remove-component.c
+ devkit_disks_helper_linux_md_remove_component_CPPFLAGS = $(AM_CPPFLAGS)
+@@ -154,7 +157,7 @@ devkit_disks_helper_drive_poll_LDADD = $(GLIB_LIBS)
+
+ # TODO: move to udev
+ udevhelperdir = $(slashlibdir)/udev
+-udevhelper_PROGRAMS = devkit-disks-probe-ata-smart
++udevhelper_PROGRAMS =
+
+ if LIBPARTED_ENABLED
+ udevhelper_PROGRAMS += devkit-disks-part-id
+@@ -170,9 +173,12 @@ devkit_disks_dm_export_CPPFLAGS = $(AM_CPPFLAGS) $(DEVMAPPER_CFLAGS)
+ devkit_disks_dm_export_LDADD = $(DEVMAPPER_LIBS)
+ endif
+
++if LIBATASMART_ENABLED
++udevhelper_PROGRAMS += devkit-disks-probe-ata-smart
+ devkit_disks_probe_ata_smart_SOURCES = devkit-disks-probe-ata-smart.c
+ devkit_disks_probe_ata_smart_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS)
+ devkit_disks_probe_ata_smart_LDADD = $(LIBATASMART_LIBS)
++endif
+ # end move to udev
+
+ # ----------------------------------------------------------------------------------------------------
+diff --git a/src/devkit-disks-device-private.c b/src/devkit-disks-device-private.c
+index c7c27c4..c61fb77 100644
+--- a/src/devkit-disks-device-private.c
++++ b/src/devkit-disks-device-private.c
+@@ -1133,6 +1133,7 @@ devkit_disks_device_set_drive_ata_smart_time_collected (DevkitDisksDevice *devic
+ }
+ }
+
++#ifdef LIBATASMART_ENABLED
+ void
+ devkit_disks_device_set_drive_ata_smart_status (DevkitDisksDevice *device, SkSmartOverall value)
+ {
+@@ -1142,6 +1143,7 @@ devkit_disks_device_set_drive_ata_smart_status (DevkitDisksDevice *device, SkSma
+ emit_changed (device, "drive_ata_smart_status");
+ }
+ }
++#endif
+
+ void
+ devkit_disks_device_set_drive_ata_smart_blob_steal (DevkitDisksDevice *device, gchar *blob, gsize blob_size)
+diff --git a/src/devkit-disks-device-private.h b/src/devkit-disks-device-private.h
+index 8b8d8d2..62c7971 100644
+--- a/src/devkit-disks-device-private.h
++++ b/src/devkit-disks-device-private.h
+@@ -23,7 +23,9 @@
+
+ #include <dbus/dbus-glib.h>
+ #include <gudev/gudev.h>
++#ifdef LIBATASMART_ENABLED
+ #include <atasmart.h>
++#endif
+
+ #include "devkit-disks-types.h"
+
+@@ -195,7 +197,9 @@ struct DevkitDisksDevicePrivate
+
+ gboolean drive_ata_smart_is_available;
+ guint64 drive_ata_smart_time_collected;
++#ifdef LIBATASMART_ENABLED
+ SkSmartOverall drive_ata_smart_status;
++#endif
+ void *drive_ata_smart_blob;
+ gsize drive_ata_smart_blob_size;
+
+@@ -317,7 +321,9 @@ void devkit_disks_device_set_holders_objpath (DevkitDisksDevice *device, GStrv v
+
+ void devkit_disks_device_set_drive_ata_smart_is_available (DevkitDisksDevice *device, gboolean value);
+ void devkit_disks_device_set_drive_ata_smart_time_collected (DevkitDisksDevice *device, guint64 value);
++#ifdef LIBATASMART_ENABLED
+ void devkit_disks_device_set_drive_ata_smart_status (DevkitDisksDevice *device, SkSmartOverall value);
++#endif
+ void devkit_disks_device_set_drive_ata_smart_blob_steal (DevkitDisksDevice *device, gchar *blob, gsize blob_size);
+
+
+diff --git a/src/devkit-disks-device.c b/src/devkit-disks-device.c
+index de9f357..69d80bf 100644
+--- a/src/devkit-disks-device.c
++++ b/src/devkit-disks-device.c
+@@ -48,7 +48,9 @@
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ #include <gudev/gudev.h>
++#ifdef LIBATASMART_ENABLED
+ #include <atasmart.h>
++#endif
+
+ #include "devkit-disks-daemon.h"
+ #include "devkit-disks-device.h"
+@@ -539,6 +541,7 @@ get_property (GObject *object,
+ case PROP_DRIVE_ATA_SMART_TIME_COLLECTED:
+ g_value_set_uint64 (value, device->priv->drive_ata_smart_time_collected);
+ break;
++#ifdef LIBATASMART_ENABLED
+ case PROP_DRIVE_ATA_SMART_STATUS:
+ {
+ const gchar *status;
+@@ -549,6 +552,7 @@ get_property (GObject *object,
+ g_value_set_string (value, status);
+ }
+ break;
++#endif
+ case PROP_DRIVE_ATA_SMART_BLOB:
+ {
+ GArray *a;
+@@ -1119,7 +1123,9 @@ devkit_disks_device_init (DevkitDisksDevice *device)
+ device->priv->slaves_objpath = g_ptr_array_new ();
+ device->priv->holders_objpath = g_ptr_array_new ();
+
++#ifdef LIBATASMART_ENABLED
+ device->priv->drive_ata_smart_status = -1;
++#endif
+ }
+
+ static void
+@@ -7947,6 +7953,7 @@ devkit_disks_device_filesystem_set_label (DevkitDisksDevice *device,
+
+ /*--------------------------------------------------------------------------------------------------------------*/
+
++#ifdef LIBATASMART_ENABLED
+ /* may be called with context==NULL */
+ static void
+ drive_ata_smart_refresh_data_completed_cb (DBusGMethodInvocation *context,
+@@ -8120,6 +8127,7 @@ devkit_disks_device_drive_ata_smart_refresh_data_authorized_cb (DevkitDisksDaemo
+ out:
+ ;
+ }
++#endif /* LIBATASMART_ENABLED */
+
+ /* may be called with context==NULL */
+ gboolean
+@@ -8127,6 +8135,7 @@ devkit_disks_device_drive_ata_smart_refresh_data (DevkitDisksDevice *device,
+ char **options,
+ DBusGMethodInvocation *context)
+ {
++#ifdef LIBATASMART_ENABLED
+ const gchar *action_id;
+
+ if (!device->priv->drive_ata_smart_is_available) {
+@@ -8153,6 +8162,9 @@ devkit_disks_device_drive_ata_smart_refresh_data (DevkitDisksDevice *device,
+
+ out:
+ return TRUE;
++#else
++ return FALSE;
++#endif
+ }
+
+ /*--------------------------------------------------------------------------------------------------------------*/
+diff --git a/tools/devkit-disks.c b/tools/devkit-disks.c
+index 3dcc300..dcff3b0 100644
+--- a/tools/devkit-disks.c
++++ b/tools/devkit-disks.c
+@@ -43,7 +43,9 @@
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
++#ifdef LIBATASMART_ENABLED
+ #include <atasmart.h>
++#endif
+
+ #include "devkit-disks-daemon-glue.h"
+ #include "devkit-disks-device-glue.h"
+@@ -829,6 +831,7 @@ ata_smart_status_to_desc (const gchar *status,
+ return desc;
+ }
+
++#ifdef LIBATASMART_ENABLED
+ static gchar *
+ get_ata_smart_unit (guint unit, guint64 pretty_value)
+ {
+@@ -942,6 +945,7 @@ print_ata_smart_attr (SkDisk *d, const SkSmartAttributeParsedData *a, void *user
+ g_free (threshold_str);
+ g_free (pretty);
+ }
++#endif
+
+ static void
+ do_show_info (const char *object_path)
+@@ -1116,6 +1120,7 @@ do_show_info (const char *object_path)
+
+ /* ------------------------------------------------------------------------------------------------- */
+
++#ifdef LIBATASMART_ENABLED
+ if (!props->drive_ata_smart_is_available) {
+ g_print (" ATA SMART: not available\n");
+ } else if (props->drive_ata_smart_time_collected == 0) {
+@@ -1162,6 +1167,7 @@ do_show_info (const char *object_path)
+
+
+ }
++#endif
+
+ /* ------------------------------------------------------------------------------------------------- */
+
+--
+1.7.7
+
diff --git a/patches/DeviceKit-disks-009/devmapper-optional.diff b/patches/DeviceKit-disks-009/devmapper-optional.diff
deleted file mode 100644
index 0df9b85..0000000
--- a/patches/DeviceKit-disks-009/devmapper-optional.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: make devmapper dependency optional
-
-This patch adds a configure option for devmapper.
-When disabled, the helper program using it will not be built.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- configure.ac | 11 ++++++++---
- src/Makefile.am | 5 ++++-
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -160,9 +160,14 @@ if test "x$enable_libparted" = xyes; the
- fi
- AM_CONDITIONAL(LIBPARTED_ENABLED, test "x$enable_libparted" = xyes)
-
--PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
--AC_SUBST(DEVMAPPER_CFLAGS)
--AC_SUBST(DEVMAPPER_LIBS)
-+AC_ARG_ENABLE(devmapper,[ --disable-devmapper],enable_devmapper=$enableval,enable_devmapper=yes)
-+
-+if test "x$enable_devmapper" = xyes; then
-+ PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
-+ AC_SUBST(DEVMAPPER_CFLAGS)
-+ AC_SUBST(DEVMAPPER_LIBS)
-+fi
-+AM_CONDITIONAL(DEVMAPPER_ENABLED, test "x$enable_devmapper" = xyes)
-
- PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
- AC_SUBST(LIBATASMART_CFLAGS)
-Index: b/src/Makefile.am
-===================================================================
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -154,7 +154,7 @@ devkit_disks_helper_drive_poll_LDADD =
-
- # TODO: move to udev
- udevhelperdir = $(slashlibdir)/udev
--udevhelper_PROGRAMS = devkit-disks-dm-export devkit-disks-probe-ata-smart
-+udevhelper_PROGRAMS = devkit-disks-probe-ata-smart
-
- if LIBPARTED_ENABLED
- udevhelper_PROGRAMS += devkit-disks-part-id
-@@ -163,9 +163,12 @@ devkit_disks_part_id_CPPFLAGS = $(AM_CPP
- devkit_disks_part_id_LDADD = $(GLIB_LIBS) $(LIBUDEV_LIBS) libpartutil.la
- endif
-
-+if DEVMAPPER_ENABLED
-+udevhelper_PROGRAMS += devkit-disks-dm-export
- devkit_disks_dm_export_SOURCES = devkit-disks-dm-export.c
- devkit_disks_dm_export_CPPFLAGS = $(AM_CPPFLAGS) $(DEVMAPPER_CFLAGS)
- devkit_disks_dm_export_LDADD = $(DEVMAPPER_LIBS)
-+endif
-
- devkit_disks_probe_ata_smart_SOURCES = devkit-disks-probe-ata-smart.c
- devkit_disks_probe_ata_smart_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS)
diff --git a/patches/DeviceKit-disks-009/libparted-optional.diff b/patches/DeviceKit-disks-009/libparted-optional.diff
deleted file mode 100644
index 0577810..0000000
--- a/patches/DeviceKit-disks-009/libparted-optional.diff
+++ /dev/null
@@ -1,95 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: make libparted dependency optional
-
-This patch adds a configure option for libparted.
-When disabled, the helper programs using it will not be built.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- configure.ac | 11 ++++++++---
- src/Makefile.am | 18 +++++++++++++-----
- 2 files changed, 21 insertions(+), 8 deletions(-)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -151,9 +151,14 @@ PKG_CHECK_MODULES(POLKIT_BACKEND_1, [pol
- AC_SUBST(POLKIT_BACKEND_1_CFLAGS)
- AC_SUBST(POLKIT_BACKEND_1_LIBS)
-
--PKG_CHECK_MODULES(LIBPARTED, [libparted >= 1.8.8])
--AC_SUBST(LIBPARTED_CFLAGS)
--AC_SUBST(LIBPARTED_LIBS)
-+AC_ARG_ENABLE(libparted,[ --disable-libparted],enable_libparted=$enableval,enable_libparted=yes)
-+
-+if test "x$enable_libparted" = xyes; then
-+ PKG_CHECK_MODULES(LIBPARTED, [libparted >= 1.8.8])
-+ AC_SUBST(LIBPARTED_CFLAGS)
-+ AC_SUBST(LIBPARTED_LIBS)
-+fi
-+AM_CONDITIONAL(LIBPARTED_ENABLED, test "x$enable_libparted" = xyes)
-
- PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
- AC_SUBST(DEVMAPPER_CFLAGS)
-Index: b/src/Makefile.am
-===================================================================
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -70,16 +70,14 @@ devkit_disks_daemon_LDADD = \
- $(LIBATASMART_LIBS) \
- $(NULL)
-
-+if LIBPARTED_ENABLED
- noinst_LTLIBRARIES = libpartutil.la
- libpartutil_la_SOURCES = partutil.h partutil.c
- libpartutil_la_CPPFLAGS = $(LIBPARTED_CFLAGS)
- libpartutil_la_LIBADD = $(LIBPARTED_LIBS)
-+endif
-
- libexec_PROGRAMS += devkit-disks-helper-mkfs \
-- devkit-disks-helper-delete-partition \
-- devkit-disks-helper-create-partition \
-- devkit-disks-helper-modify-partition \
-- devkit-disks-helper-create-partition-table \
- devkit-disks-helper-change-filesystem-label \
- devkit-disks-helper-linux-md-remove-component \
- devkit-disks-helper-fstab-mounter \
-@@ -99,6 +97,12 @@ devkit_disks_helper_mkfs_SOURCES = job-s
- devkit_disks_helper_mkfs_CPPFLAGS = $(AM_CPPFLAGS)
- devkit_disks_helper_mkfs_LDADD = $(GLIB_LIBS)
-
-+if LIBPARTED_ENABLED
-+libexec_PROGRAMS += devkit-disks-helper-delete-partition \
-+ devkit-disks-helper-create-partition \
-+ devkit-disks-helper-modify-partition \
-+ devkit-disks-helper-create-partition-table \
-+ $(NULL)
- devkit_disks_helper_delete_partition_SOURCES = job-shared.h job-delete-partition.c
- devkit_disks_helper_delete_partition_CPPFLAGS = $(AM_CPPFLAGS)
- devkit_disks_helper_delete_partition_LDADD = $(GLIB_LIBS) libpartutil.la
-@@ -114,6 +118,7 @@ devkit_disks_helper_modify_partition_LDA
- devkit_disks_helper_create_partition_table_SOURCES = job-shared.h job-create-partition-table.c
- devkit_disks_helper_create_partition_table_CPPFLAGS = $(AM_CPPFLAGS)
- devkit_disks_helper_create_partition_table_LDADD = $(GLIB_LIBS) libpartutil.la
-+endif
-
- devkit_disks_helper_change_filesystem_label_SOURCES = job-shared.h job-change-filesystem-label.c
- devkit_disks_helper_change_filesystem_label_CPPFLAGS = $(AM_CPPFLAGS)
-@@ -149,11 +154,14 @@ devkit_disks_helper_drive_poll_LDADD =
-
- # TODO: move to udev
- udevhelperdir = $(slashlibdir)/udev
--udevhelper_PROGRAMS = devkit-disks-part-id devkit-disks-dm-export devkit-disks-probe-ata-smart
-+udevhelper_PROGRAMS = devkit-disks-dm-export devkit-disks-probe-ata-smart
-
-+if LIBPARTED_ENABLED
-+udevhelper_PROGRAMS += devkit-disks-part-id
- devkit_disks_part_id_SOURCES = part-id.c
- devkit_disks_part_id_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUDEV_CFLAGS)
- devkit_disks_part_id_LDADD = $(GLIB_LIBS) $(LIBUDEV_LIBS) libpartutil.la
-+endif
-
- devkit_disks_dm_export_SOURCES = devkit-disks-dm-export.c
- devkit_disks_dm_export_CPPFLAGS = $(AM_CPPFLAGS) $(DEVMAPPER_CFLAGS)
diff --git a/patches/DeviceKit-disks-009/libsgutils-optional.diff b/patches/DeviceKit-disks-009/libsgutils-optional.diff
deleted file mode 100644
index 54a06a8..0000000
--- a/patches/DeviceKit-disks-009/libsgutils-optional.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: make sgutils2 dependency optional
-
-This patch adds a configure option for sgutils2.
-When disabled, the helper program using it will not be built.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- configure.ac | 21 +++++++++++++--------
- src/Makefile.am | 5 ++++-
- 2 files changed, 17 insertions(+), 9 deletions(-)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -109,15 +109,20 @@ if test "x$GCC" = "xyes"; then
- changequote([,])dnl
- fi
-
--have_sgutils="false"
--AC_CHECK_LIB([sgutils2], [sg_ll_inquiry], have_sgutils="true")
--if test x$have_sgutils != "xtrue"; then
-- AC_MSG_ERROR([libsgutils2 is needed])
-+AC_ARG_ENABLE(sgutils2, [ --disable-sgutils2],enable_sgutils2=$enableval,enable_sgutils2=yes)
-+
-+if test "x$enable_sgutils2" = xyes; then
-+ have_sgutils="false"
-+ AC_CHECK_LIB([sgutils2], [sg_ll_inquiry], have_sgutils="true")
-+ if test x$have_sgutils != "xtrue"; then
-+ AC_MSG_ERROR([libsgutils2 is needed])
-+ fi
-+ SGUTILS_CFLAGS=""
-+ SGUTILS_LIBS="-lsgutils2"
-+ AC_SUBST(SGUTILS_CFLAGS)
-+ AC_SUBST(SGUTILS_LIBS)
- fi
--SGUTILS_CFLAGS=""
--SGUTILS_LIBS="-lsgutils2"
--AC_SUBST(SGUTILS_CFLAGS)
--AC_SUBST(SGUTILS_LIBS)
-+AM_CONDITIONAL(SGUTILS2_ENABLED, test "x$enable_sgutils2" = xyes)
-
-
- PKG_CHECK_MODULES(GUDEV, [gudev-1.0 >= 001])
-Index: b/src/Makefile.am
-===================================================================
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -85,11 +85,14 @@ libexec_PROGRAMS += devkit-disks-helper-
- devkit-disks-helper-fstab-mounter \
- devkit-disks-helper-ata-smart-collect \
- devkit-disks-helper-ata-smart-selftest \
-- devkit-disks-helper-drive-detach \
- devkit-disks-helper-drive-poll \
- devkit-disks-helper-linux-md-check \
- $(NULL)
-
-+if SGUTILS2_ENABLED
-+libexec_PROGRAMS += devkit-disks-helper-drive-detach
-+endif
-+
- libexec_SCRIPTS = devkit-disks-helper-change-luks-password
-
- devkit_disks_helper_mkfs_SOURCES = job-shared.h job-mkfs.c
diff --git a/patches/DeviceKit-disks-009/series b/patches/DeviceKit-disks-009/series
deleted file mode 100644
index e490966..0000000
--- a/patches/DeviceKit-disks-009/series
+++ /dev/null
@@ -1,4 +0,0 @@
-libsgutils-optional.diff
-libparted-optional.diff
-devmapper-optional.diff
-smart-optional.diff
diff --git a/patches/DeviceKit-disks-009/smart-optional.diff b/patches/DeviceKit-disks-009/smart-optional.diff
deleted file mode 100644
index 062f7d7..0000000
--- a/patches/DeviceKit-disks-009/smart-optional.diff
+++ /dev/null
@@ -1,269 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: make libatasmart dependency optional
-
-This patch adds a configure option for libatasmart.
-When disabled, the helper programs using it will not be built.
-Any other code using libatasmart is guarded with appropriate ifdefs.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- configure.ac | 12 +++++++++---
- src/Makefile.am | 12 +++++++++---
- src/devkit-disks-device-private.c | 2 ++
- src/devkit-disks-device-private.h | 6 ++++++
- src/devkit-disks-device.c | 12 ++++++++++++
- tools/devkit-disks.c | 6 ++++++
- 6 files changed, 44 insertions(+), 6 deletions(-)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -169,9 +169,15 @@ if test "x$enable_devmapper" = xyes; the
- fi
- AM_CONDITIONAL(DEVMAPPER_ENABLED, test "x$enable_devmapper" = xyes)
-
--PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
--AC_SUBST(LIBATASMART_CFLAGS)
--AC_SUBST(LIBATASMART_LIBS)
-+AC_ARG_ENABLE(libatasmart,[ --disable-libatasmart],enable_libatasmart=$enableval,enable_libatasmart=yes)
-+
-+if test "x$enable_libatasmart" = xyes; then
-+ PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
-+ AC_SUBST(LIBATASMART_CFLAGS)
-+ AC_SUBST(LIBATASMART_LIBS)
-+ AC_DEFINE(LIBATASMART_ENABLED,[1],[libatasmart enabled])
-+fi
-+AM_CONDITIONAL(LIBATASMART_ENABLED, test "x$enable_libatasmart" = xyes)
-
- PKG_CHECK_MODULES(LIBUDEV, [libudev >= 142])
- AC_SUBST(LIBUDEV_CFLAGS)
-Index: b/src/Makefile.am
-===================================================================
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -81,8 +81,6 @@ libexec_PROGRAMS += devkit-disks-helper-
- devkit-disks-helper-change-filesystem-label \
- devkit-disks-helper-linux-md-remove-component \
- devkit-disks-helper-fstab-mounter \
-- devkit-disks-helper-ata-smart-collect \
-- devkit-disks-helper-ata-smart-selftest \
- devkit-disks-helper-drive-poll \
- devkit-disks-helper-linux-md-check \
- $(NULL)
-@@ -124,6 +122,10 @@ devkit_disks_helper_change_filesystem_la
- devkit_disks_helper_change_filesystem_label_CPPFLAGS = $(AM_CPPFLAGS)
- devkit_disks_helper_change_filesystem_label_LDADD = $(GLIB_LIBS)
-
-+if LIBATASMART_ENABLED
-+libexec_PROGRAMS += devkit-disks-helper-ata-smart-collect \
-+ devkit-disks-helper-ata-smart-selftest \
-+ $(NULL)
- devkit_disks_helper_ata_smart_selftest_SOURCES = job-shared.h job-ata-smart-selftest.c
- devkit_disks_helper_ata_smart_selftest_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS) $(GLIB_CFLAGS)
- devkit_disks_helper_ata_smart_selftest_LDADD = $(LIBATASMART_LIBS) $(GLIB_LIBS)
-@@ -131,6 +133,7 @@ devkit_disks_helper_ata_smart_selftest_L
- devkit_disks_helper_ata_smart_collect_SOURCES = job-ata-smart-collect.c
- devkit_disks_helper_ata_smart_collect_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS) $(GLIB_CFLAGS)
- devkit_disks_helper_ata_smart_collect_LDADD = $(LIBATASMART_LIBS) $(GLIB_LIBS)
-+endif
-
- devkit_disks_helper_linux_md_remove_component_SOURCES = job-shared.h job-linux-md-remove-component.c
- devkit_disks_helper_linux_md_remove_component_CPPFLAGS = $(AM_CPPFLAGS)
-@@ -154,7 +157,7 @@ devkit_disks_helper_drive_poll_LDADD =
-
- # TODO: move to udev
- udevhelperdir = $(slashlibdir)/udev
--udevhelper_PROGRAMS = devkit-disks-probe-ata-smart
-+udevhelper_PROGRAMS =
-
- if LIBPARTED_ENABLED
- udevhelper_PROGRAMS += devkit-disks-part-id
-@@ -170,9 +173,12 @@ devkit_disks_dm_export_CPPFLAGS = $(AM_C
- devkit_disks_dm_export_LDADD = $(DEVMAPPER_LIBS)
- endif
-
-+if LIBATASMART_ENABLED
-+udevhelper_PROGRAMS += devkit-disks-probe-ata-smart
- devkit_disks_probe_ata_smart_SOURCES = devkit-disks-probe-ata-smart.c
- devkit_disks_probe_ata_smart_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS)
- devkit_disks_probe_ata_smart_LDADD = $(LIBATASMART_LIBS)
-+endif
- # end move to udev
-
- # ----------------------------------------------------------------------------------------------------
-Index: b/src/devkit-disks-device-private.h
-===================================================================
---- a/src/devkit-disks-device-private.h
-+++ b/src/devkit-disks-device-private.h
-@@ -23,7 +23,9 @@
-
- #include <dbus/dbus-glib.h>
- #include <gudev/gudev.h>
-+#ifdef LIBATASMART_ENABLED
- #include <atasmart.h>
-+#endif
-
- #include "devkit-disks-types.h"
-
-@@ -195,7 +197,9 @@ struct DevkitDisksDevicePrivate
-
- gboolean drive_ata_smart_is_available;
- guint64 drive_ata_smart_time_collected;
-+#ifdef LIBATASMART_ENABLED
- SkSmartOverall drive_ata_smart_status;
-+#endif
- void *drive_ata_smart_blob;
- gsize drive_ata_smart_blob_size;
-
-@@ -317,7 +321,9 @@ void devkit_disks_device_set_holders_obj
-
- void devkit_disks_device_set_drive_ata_smart_is_available (DevkitDisksDevice *device, gboolean value);
- void devkit_disks_device_set_drive_ata_smart_time_collected (DevkitDisksDevice *device, guint64 value);
-+#ifdef LIBATASMART_ENABLED
- void devkit_disks_device_set_drive_ata_smart_status (DevkitDisksDevice *device, SkSmartOverall value);
-+#endif
- void devkit_disks_device_set_drive_ata_smart_blob_steal (DevkitDisksDevice *device, gchar *blob, gsize blob_size);
-
-
-Index: b/src/devkit-disks-device.c
-===================================================================
---- a/src/devkit-disks-device.c
-+++ b/src/devkit-disks-device.c
-@@ -48,7 +48,9 @@
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
- #include <gudev/gudev.h>
-+#ifdef LIBATASMART_ENABLED
- #include <atasmart.h>
-+#endif
-
- #include "devkit-disks-daemon.h"
- #include "devkit-disks-device.h"
-@@ -539,6 +541,7 @@ get_property (GObject *object,
- case PROP_DRIVE_ATA_SMART_TIME_COLLECTED:
- g_value_set_uint64 (value, device->priv->drive_ata_smart_time_collected);
- break;
-+#ifdef LIBATASMART_ENABLED
- case PROP_DRIVE_ATA_SMART_STATUS:
- {
- const gchar *status;
-@@ -549,6 +552,7 @@ get_property (GObject *object,
- g_value_set_string (value, status);
- }
- break;
-+#endif
- case PROP_DRIVE_ATA_SMART_BLOB:
- {
- GArray *a;
-@@ -1119,7 +1123,9 @@ devkit_disks_device_init (DevkitDisksDev
- device->priv->slaves_objpath = g_ptr_array_new ();
- device->priv->holders_objpath = g_ptr_array_new ();
-
-+#ifdef LIBATASMART_ENABLED
- device->priv->drive_ata_smart_status = -1;
-+#endif
- }
-
- static void
-@@ -7947,6 +7953,7 @@ devkit_disks_device_filesystem_set_label
-
- /*--------------------------------------------------------------------------------------------------------------*/
-
-+#ifdef LIBATASMART_ENABLED
- /* may be called with context==NULL */
- static void
- drive_ata_smart_refresh_data_completed_cb (DBusGMethodInvocation *context,
-@@ -8120,6 +8127,7 @@ devkit_disks_device_drive_ata_smart_refr
- out:
- ;
- }
-+#endif /* LIBATASMART_ENABLED */
-
- /* may be called with context==NULL */
- gboolean
-@@ -8127,6 +8135,7 @@ devkit_disks_device_drive_ata_smart_refr
- char **options,
- DBusGMethodInvocation *context)
- {
-+#ifdef LIBATASMART_ENABLED
- const gchar *action_id;
-
- if (!device->priv->drive_ata_smart_is_available) {
-@@ -8153,6 +8162,9 @@ devkit_disks_device_drive_ata_smart_refr
-
- out:
- return TRUE;
-+#else
-+ return FALSE;
-+#endif
- }
-
- /*--------------------------------------------------------------------------------------------------------------*/
-Index: b/src/devkit-disks-device-private.c
-===================================================================
---- a/src/devkit-disks-device-private.c
-+++ b/src/devkit-disks-device-private.c
-@@ -1133,6 +1133,7 @@ devkit_disks_device_set_drive_ata_smart_
- }
- }
-
-+#ifdef LIBATASMART_ENABLED
- void
- devkit_disks_device_set_drive_ata_smart_status (DevkitDisksDevice *device, SkSmartOverall value)
- {
-@@ -1142,6 +1143,7 @@ devkit_disks_device_set_drive_ata_smart_
- emit_changed (device, "drive_ata_smart_status");
- }
- }
-+#endif
-
- void
- devkit_disks_device_set_drive_ata_smart_blob_steal (DevkitDisksDevice *device, gchar *blob, gsize blob_size)
-Index: b/tools/devkit-disks.c
-===================================================================
---- a/tools/devkit-disks.c
-+++ b/tools/devkit-disks.c
-@@ -43,7 +43,9 @@
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
-
-+#ifdef LIBATASMART_ENABLED
- #include <atasmart.h>
-+#endif
-
- #include "devkit-disks-daemon-glue.h"
- #include "devkit-disks-device-glue.h"
-@@ -829,6 +831,7 @@ ata_smart_status_to_desc (const gchar *s
- return desc;
- }
-
-+#ifdef LIBATASMART_ENABLED
- static gchar *
- get_ata_smart_unit (guint unit, guint64 pretty_value)
- {
-@@ -942,6 +945,7 @@ print_ata_smart_attr (SkDisk *d, const S
- g_free (threshold_str);
- g_free (pretty);
- }
-+#endif
-
- static void
- do_show_info (const char *object_path)
-@@ -1116,6 +1120,7 @@ do_show_info (const char *object_path)
-
- /* ------------------------------------------------------------------------------------------------- */
-
-+#ifdef LIBATASMART_ENABLED
- if (!props->drive_ata_smart_is_available) {
- g_print (" ATA SMART: not available\n");
- } else if (props->drive_ata_smart_time_collected == 0) {
-@@ -1162,6 +1167,7 @@ do_show_info (const char *object_path)
-
-
- }
-+#endif
-
- /* ------------------------------------------------------------------------------------------------- */
-
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 03/28] mplayer: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 02/28] devicekit-disks: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 04/28] policykit: " Robert Schwebel
` (24 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
...ayer-Suport-RGB-frambuffers-in-vo_fbdev.c.patch | 98 ++++++++++++++++++++
patches/MPlayer-1.0rc4/series | 1 -
.../MPlayer-1.0rc4/support_RGB_framebuffer.patch | 89 ------------------
3 files changed, 98 insertions(+), 90 deletions(-)
create mode 100644 patches/MPlayer-1.0rc4/0001-MPlayer-Suport-RGB-frambuffers-in-vo_fbdev.c.patch
delete mode 100644 patches/MPlayer-1.0rc4/series
delete mode 100644 patches/MPlayer-1.0rc4/support_RGB_framebuffer.patch
diff --git a/patches/MPlayer-1.0rc4/0001-MPlayer-Suport-RGB-frambuffers-in-vo_fbdev.c.patch b/patches/MPlayer-1.0rc4/0001-MPlayer-Suport-RGB-frambuffers-in-vo_fbdev.c.patch
new file mode 100644
index 0000000..c796e3d
--- /dev/null
+++ b/patches/MPlayer-1.0rc4/0001-MPlayer-Suport-RGB-frambuffers-in-vo_fbdev.c.patch
@@ -0,0 +1,98 @@
+From d168b399924f2cf753536d64753290988354eba0 Mon Sep 17 00:00:00 2001
+From: unknown author <unknown.author@example.com>
+Date: Sat, 29 Oct 2011 18:44:33 +0200
+Subject: [PATCH] MPlayer: Suport RGB frambuffers in vo_fbdev.c
+
+Using this upstream patch (r33289) mplayer supports a RGB framebuffer.
+Before only BGR framebuffers were supported.
+
+Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
+---
+ libvo/vo_fbdev.c | 20 +++++++++++++-------
+ 1 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c
+index 7ddf2ad..92bad49 100644
+--- a/libvo/vo_fbdev.c
++++ b/libvo/vo_fbdev.c
+@@ -491,7 +491,7 @@ static fb_mode_t *find_best_mode(int xres, int yres, range_t *hfreq,
+ return best;
+ }
+
+-static void set_bpp(struct fb_var_screeninfo *p, int bpp)
++static void set_bpp(struct fb_var_screeninfo *p, int bpp, int rgb)
+ {
+ p->bits_per_pixel = FFALIGN(bpp, 2);
+ p->red.msb_right = p->green.msb_right = p->blue.msb_right = p->transp.msb_right = 0;
+@@ -530,15 +530,19 @@ static void set_bpp(struct fb_var_screeninfo *p, int bpp)
+ p->blue.length = 4;
+ break;
+ }
++ if (rgb) {
++ p->blue.offset = p->red.offset;
++ p->red.offset = 0;
++ }
+ }
+
+-static void fb_mode2fb_vinfo(fb_mode_t *m, struct fb_var_screeninfo *v)
++static void fb_mode2fb_vinfo(fb_mode_t *m, struct fb_var_screeninfo *v, int rgb)
+ {
+ v->xres = m->xres;
+ v->yres = m->yres;
+ v->xres_virtual = m->vxres;
+ v->yres_virtual = m->vyres;
+- set_bpp(v, m->depth);
++ set_bpp(v, m->depth, rgb);
+ v->pixclock = m->pixclock;
+ v->left_margin = m->left;
+ v->right_margin = m->right;
+@@ -574,6 +578,7 @@ static struct fb_var_screeninfo fb_vinfo;
+ static unsigned short fb_ored[256], fb_ogreen[256], fb_oblue[256];
+ static struct fb_cmap fb_oldcmap = { 0, 256, fb_ored, fb_ogreen, fb_oblue };
+ static int fb_cmap_changed = 0;
++static int fb_rgb;
+ static int fb_pixel_size; // 32: 4 24: 3 16: 2 15: 2
+ static int fb_bpp; // 32: 32 24: 24 16: 16 15: 15
+ static int fb_bpp_we_want; // 32: 32 24: 24 16: 16 15: 15
+@@ -698,6 +703,7 @@ static int fb_preinit(int reset)
+ mp_msg(MSGT_VO, MSGL_ERR, "notice: Can't open /dev/tty: %s\n", strerror(errno));
+ }
+
++ fb_rgb = !fb_vinfo.red.offset;
+ fb_bpp = fb_vinfo.bits_per_pixel;
+ if (fb_bpp == 16)
+ fb_bpp = fb_vinfo.red.length + fb_vinfo.green.length + fb_vinfo.blue.length;
+@@ -791,7 +797,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
+ mp_msg(MSGT_VO, MSGL_ERR, "can't find requested video mode\n");
+ return 1;
+ }
+- fb_mode2fb_vinfo(fb_mode, &fb_vinfo);
++ fb_mode2fb_vinfo(fb_mode, &fb_vinfo, fb_rgb);
+ } else if (vm) {
+ monitor_hfreq = str2range(monitor_hfreq_str);
+ monitor_vfreq = str2range(monitor_vfreq_str);
+@@ -808,10 +814,10 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
+ }
+ mp_msg(MSGT_VO, MSGL_V, "using mode %dx%d @ %.1fHz\n", fb_mode->xres,
+ fb_mode->yres, vsf(fb_mode));
+- fb_mode2fb_vinfo(fb_mode, &fb_vinfo);
++ fb_mode2fb_vinfo(fb_mode, &fb_vinfo, fb_rgb);
+ }
+ fb_bpp_we_want = fb_bpp;
+- set_bpp(&fb_vinfo, fb_bpp);
++ set_bpp(&fb_vinfo, fb_bpp, fb_rgb);
+ fb_vinfo.xres_virtual = fb_vinfo.xres;
+ fb_vinfo.yres_virtual = fb_vinfo.yres;
+ fb_page = 0;
+@@ -1016,7 +1022,7 @@ static int query_format(uint32_t format)
+ if (vidix_name)
+ return vidix_query_fourcc(format);
+ #endif
+- if ((format & IMGFMT_BGR_MASK) == IMGFMT_BGR) {
++ if ((format & IMGFMT_BGR_MASK) == (fb_rgb ? IMGFMT_RGB : IMGFMT_BGR)) {
+ int bpp = format & 0xff;
+
+ if (bpp == fb_bpp)
+--
+1.7.7
+
diff --git a/patches/MPlayer-1.0rc4/series b/patches/MPlayer-1.0rc4/series
deleted file mode 100644
index 9f5ef95..0000000
--- a/patches/MPlayer-1.0rc4/series
+++ /dev/null
@@ -1 +0,0 @@
-support_RGB_framebuffer.patch -p0
diff --git a/patches/MPlayer-1.0rc4/support_RGB_framebuffer.patch b/patches/MPlayer-1.0rc4/support_RGB_framebuffer.patch
deleted file mode 100644
index 0e4b6e2..0000000
--- a/patches/MPlayer-1.0rc4/support_RGB_framebuffer.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-Subject: MPlayer: Suport RGB frambuffers in vo_fbdev.c
-
-Using this upstream patch (r33289) mplayer supports a RGB framebuffer.
-Before only BGR framebuffers were supported.
-
-Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
-
-Index: libvo/vo_fbdev.c
-===================================================================
---- libvo/vo_fbdev.c (Revision 33288)
-+++ libvo/vo_fbdev.c (Revision 33289)
-@@ -487,7 +487,7 @@
- return best;
- }
-
--static void set_bpp(struct fb_var_screeninfo *p, int bpp)
-+static void set_bpp(struct fb_var_screeninfo *p, int bpp, int rgb)
- {
- p->bits_per_pixel = FFALIGN(bpp, 2);
- p->red.msb_right = p->green.msb_right = p->blue.msb_right = p->transp.msb_right = 0;
-@@ -526,15 +526,19 @@
- p->blue.length = 4;
- break;
- }
-+ if (rgb) {
-+ p->blue.offset = p->red.offset;
-+ p->red.offset = 0;
-+ }
- }
-
--static void fb_mode2fb_vinfo(fb_mode_t *m, struct fb_var_screeninfo *v)
-+static void fb_mode2fb_vinfo(fb_mode_t *m, struct fb_var_screeninfo *v, int rgb)
- {
- v->xres = m->xres;
- v->yres = m->yres;
- v->xres_virtual = m->vxres;
- v->yres_virtual = m->vyres;
-- set_bpp(v, m->depth);
-+ set_bpp(v, m->depth, rgb);
- v->pixclock = m->pixclock;
- v->left_margin = m->left;
- v->right_margin = m->right;
-@@ -570,6 +574,7 @@
- static unsigned short fb_ored[256], fb_ogreen[256], fb_oblue[256];
- static struct fb_cmap fb_oldcmap = { 0, 256, fb_ored, fb_ogreen, fb_oblue };
- static int fb_cmap_changed = 0;
-+static int fb_rgb;
- static int fb_pixel_size; // 32: 4 24: 3 16: 2 15: 2
- static int fb_bpp; // 32: 32 24: 24 16: 16 15: 15
- static int fb_bpp_we_want; // 32: 32 24: 24 16: 16 15: 15
-@@ -694,6 +699,7 @@
- mp_msg(MSGT_VO, MSGL_ERR, "notice: Can't open /dev/tty: %s\n", strerror(errno));
- }
-
-+ fb_rgb = !fb_vinfo.red.offset;
- fb_bpp = fb_vinfo.bits_per_pixel;
- if (fb_bpp == 16)
- fb_bpp = fb_vinfo.red.length + fb_vinfo.green.length + fb_vinfo.blue.length;
-@@ -787,7 +793,7 @@
- mp_msg(MSGT_VO, MSGL_ERR, "can't find requested video mode\n");
- return 1;
- }
-- fb_mode2fb_vinfo(fb_mode, &fb_vinfo);
-+ fb_mode2fb_vinfo(fb_mode, &fb_vinfo, fb_rgb);
- } else if (vm) {
- monitor_hfreq = str2range(monitor_hfreq_str);
- monitor_vfreq = str2range(monitor_vfreq_str);
-@@ -804,10 +810,10 @@
- }
- mp_msg(MSGT_VO, MSGL_V, "using mode %dx%d @ %.1fHz\n", fb_mode->xres,
- fb_mode->yres, vsf(fb_mode));
-- fb_mode2fb_vinfo(fb_mode, &fb_vinfo);
-+ fb_mode2fb_vinfo(fb_mode, &fb_vinfo, fb_rgb);
- }
- fb_bpp_we_want = fb_bpp;
-- set_bpp(&fb_vinfo, fb_bpp);
-+ set_bpp(&fb_vinfo, fb_bpp, fb_rgb);
- fb_vinfo.xres_virtual = fb_vinfo.xres;
- fb_vinfo.yres_virtual = fb_vinfo.yres;
- fb_page = 0;
-@@ -1012,7 +1018,7 @@
- if (vidix_name)
- return vidix_query_fourcc(format);
- #endif
-- if ((format & IMGFMT_BGR_MASK) == IMGFMT_BGR) {
-+ if ((format & IMGFMT_BGR_MASK) == (fb_rgb ? IMGFMT_RGB : IMGFMT_BGR)) {
- int bpp = format & 0xff;
-
- if (bpp == fb_bpp)
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 04/28] policykit: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 02/28] devicekit-disks: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 03/28] mplayer: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 05/28] sdl: " Robert Schwebel
` (23 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
.../0001-compiling-without-pam-doesn-t-work.patch | 33 ++++++++++++++++++++
.../0002-we-don-t-have-_pk_debug-any-more.patch | 27 ++++++++++++++++
.../PolicyKit-0.9/PolicyKit-0.9-no-pk-debug.diff | 23 --------------
.../PolicyKit-0.9-pam-when-disabled.diff | 29 -----------------
patches/PolicyKit-0.9/series | 2 -
5 files changed, 60 insertions(+), 54 deletions(-)
create mode 100644 patches/PolicyKit-0.9/0001-compiling-without-pam-doesn-t-work.patch
create mode 100644 patches/PolicyKit-0.9/0002-we-don-t-have-_pk_debug-any-more.patch
delete mode 100644 patches/PolicyKit-0.9/PolicyKit-0.9-no-pk-debug.diff
delete mode 100644 patches/PolicyKit-0.9/PolicyKit-0.9-pam-when-disabled.diff
delete mode 100644 patches/PolicyKit-0.9/series
diff --git a/patches/PolicyKit-0.9/0001-compiling-without-pam-doesn-t-work.patch b/patches/PolicyKit-0.9/0001-compiling-without-pam-doesn-t-work.patch
new file mode 100644
index 0000000..857c43b
--- /dev/null
+++ b/patches/PolicyKit-0.9/0001-compiling-without-pam-doesn-t-work.patch
@@ -0,0 +1,33 @@
+From b179c018f738fd8802fdef91cdcc5c3c9476f49f Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:46:37 +0200
+Subject: [PATCH 1/2] compiling without pam doesn't work
+
+When compiled with --with-authfw=none, I get
+
+polkit-resolve-exe-helper.c:46:31: error: security/pam_appl.h: No such file or directory
+
+The patch below fixes it.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ src/polkit-dbus/polkit-resolve-exe-helper.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/polkit-dbus/polkit-resolve-exe-helper.c b/src/polkit-dbus/polkit-resolve-exe-helper.c
+index c56b2f5..cf696a9 100644
+--- a/src/polkit-dbus/polkit-resolve-exe-helper.c
++++ b/src/polkit-dbus/polkit-resolve-exe-helper.c
+@@ -43,7 +43,9 @@
+ #ifdef HAVE_FREEBSD
+ #include <sys/param.h>
+ #endif
++#ifdef HAVE_PAM
+ #include <security/pam_appl.h>
++#endif
+ #include <grp.h>
+ #include <pwd.h>
+ #include <syslog.h>
+--
+1.7.7
+
diff --git a/patches/PolicyKit-0.9/0002-we-don-t-have-_pk_debug-any-more.patch b/patches/PolicyKit-0.9/0002-we-don-t-have-_pk_debug-any-more.patch
new file mode 100644
index 0000000..7c524ca
--- /dev/null
+++ b/patches/PolicyKit-0.9/0002-we-don-t-have-_pk_debug-any-more.patch
@@ -0,0 +1,27 @@
+From 2e711baa8a34ffd36955db4e59ad1449468f4ed2 Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:46:37 +0200
+Subject: [PATCH 2/2] we don't have _pk_debug any more
+
+../../src/polkit/.libs/libpolkit.so: undefined reference to `_pk_debug'
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ src/polkit/polkit-authorization-db-dummy.c | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/src/polkit/polkit-authorization-db-dummy.c b/src/polkit/polkit-authorization-db-dummy.c
+index 0b4c848..9615619 100644
+--- a/src/polkit/polkit-authorization-db-dummy.c
++++ b/src/polkit/polkit-authorization-db-dummy.c
+@@ -105,7 +105,6 @@ void
+ polkit_authorization_db_debug (PolKitAuthorizationDB *authdb)
+ {
+ kit_return_if_fail (authdb != NULL);
+- _pk_debug ("PolKitAuthorizationDB: refcount=%d", authdb->refcount);
+ }
+
+ polkit_bool_t
+--
+1.7.7
+
diff --git a/patches/PolicyKit-0.9/PolicyKit-0.9-no-pk-debug.diff b/patches/PolicyKit-0.9/PolicyKit-0.9-no-pk-debug.diff
deleted file mode 100644
index 53b0131..0000000
--- a/patches/PolicyKit-0.9/PolicyKit-0.9-no-pk-debug.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: [patch] we don't have _pk_debug any more
-
-../../src/polkit/.libs/libpolkit.so: undefined reference to `_pk_debug'
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- src/polkit/polkit-authorization-db-dummy.c | 1 -
- 1 file changed, 1 deletion(-)
-
-Index: PolicyKit-0.9/src/polkit/polkit-authorization-db-dummy.c
-===================================================================
---- PolicyKit-0.9.orig/src/polkit/polkit-authorization-db-dummy.c
-+++ PolicyKit-0.9/src/polkit/polkit-authorization-db-dummy.c
-@@ -105,7 +105,6 @@ void
- polkit_authorization_db_debug (PolKitAuthorizationDB *authdb)
- {
- kit_return_if_fail (authdb != NULL);
-- _pk_debug ("PolKitAuthorizationDB: refcount=%d", authdb->refcount);
- }
-
- polkit_bool_t
diff --git a/patches/PolicyKit-0.9/PolicyKit-0.9-pam-when-disabled.diff b/patches/PolicyKit-0.9/PolicyKit-0.9-pam-when-disabled.diff
deleted file mode 100644
index 912dbd6..0000000
--- a/patches/PolicyKit-0.9/PolicyKit-0.9-pam-when-disabled.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: [patch] compiling without pam doesn't work
-
-When compiled with --with-authfw=none, I get
-
-polkit-resolve-exe-helper.c:46:31: error: security/pam_appl.h: No such file or directory
-
-The patch below fixes it.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- src/polkit-dbus/polkit-resolve-exe-helper.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-Index: PolicyKit-0.9/src/polkit-dbus/polkit-resolve-exe-helper.c
-===================================================================
---- PolicyKit-0.9.orig/src/polkit-dbus/polkit-resolve-exe-helper.c
-+++ PolicyKit-0.9/src/polkit-dbus/polkit-resolve-exe-helper.c
-@@ -43,7 +43,9 @@
- #ifdef HAVE_FREEBSD
- #include <sys/param.h>
- #endif
-+#ifdef HAVE_PAM
- #include <security/pam_appl.h>
-+#endif
- #include <grp.h>
- #include <pwd.h>
- #include <syslog.h>
diff --git a/patches/PolicyKit-0.9/series b/patches/PolicyKit-0.9/series
deleted file mode 100644
index ba8135f..0000000
--- a/patches/PolicyKit-0.9/series
+++ /dev/null
@@ -1,2 +0,0 @@
-PolicyKit-0.9-pam-when-disabled.diff
-PolicyKit-0.9-no-pk-debug.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 05/28] sdl: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (2 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 04/28] policykit: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 06/28] sdl-mixer: " Robert Schwebel
` (22 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
.../0001-SDL-1.2.10-sdl-config.in.diff.patch | 54 ++++++++++++++++
patches/SDL-1.2.14/0002-fix-parallel-build.patch | 28 ++++++++
patches/SDL-1.2.14/0003-fix-PPC-build.patch | 68 ++++++++++++++++++++
patches/SDL-1.2.14/SDL-1.2.10-sdl-config.in.diff | 50 --------------
patches/SDL-1.2.14/fix-parallel-build.diff | 23 -------
patches/SDL-1.2.14/fix-ppc-build.diff | 64 ------------------
patches/SDL-1.2.14/series | 3 -
7 files changed, 150 insertions(+), 140 deletions(-)
create mode 100644 patches/SDL-1.2.14/0001-SDL-1.2.10-sdl-config.in.diff.patch
create mode 100644 patches/SDL-1.2.14/0002-fix-parallel-build.patch
create mode 100644 patches/SDL-1.2.14/0003-fix-PPC-build.patch
delete mode 100644 patches/SDL-1.2.14/SDL-1.2.10-sdl-config.in.diff
delete mode 100644 patches/SDL-1.2.14/fix-parallel-build.diff
delete mode 100644 patches/SDL-1.2.14/fix-ppc-build.diff
delete mode 100644 patches/SDL-1.2.14/series
diff --git a/patches/SDL-1.2.14/0001-SDL-1.2.10-sdl-config.in.diff.patch b/patches/SDL-1.2.14/0001-SDL-1.2.10-sdl-config.in.diff.patch
new file mode 100644
index 0000000..a8e127d
--- /dev/null
+++ b/patches/SDL-1.2.14/0001-SDL-1.2.10-sdl-config.in.diff.patch
@@ -0,0 +1,54 @@
+From fd1d1db0ce2f814fb9f1b9c50b3dca495b44110a Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:49:04 +0200
+Subject: [PATCH 1/3] SDL-1.2.10-sdl-config.in.diff
+
+Subject teach sdl-config about sysroot
+
+Teach sdl-config the concept of sysroot, but disable manual prefix overwriting.
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ sdl-config.in | 14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/sdl-config.in b/sdl-config.in
+index e0fcc0c..0159c47 100644
+--- a/sdl-config.in
++++ b/sdl-config.in
+@@ -23,10 +23,10 @@ while test $# -gt 0; do
+
+ case $1 in
+ --prefix=*)
+- prefix=$optarg
+- if test $exec_prefix_set = no ; then
+- exec_prefix=$optarg
+- fi
++# prefix=$optarg
++# if test $exec_prefix_set = no ; then
++# exec_prefix=$optarg
++# fi
+ ;;
+ --prefix)
+ echo $prefix
+@@ -42,14 +42,14 @@ while test $# -gt 0; do
+ echo @SDL_VERSION@
+ ;;
+ --cflags)
+- echo -I@includedir@/SDL @SDL_CFLAGS@
++ echo -I${SYSROOT}@includedir@/SDL @SDL_CFLAGS@
+ ;;
+ @ENABLE_SHARED_TRUE@ --libs)
+-@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
++@ENABLE_SHARED_TRUE@ echo -L${SYSROOT}@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
+ @ENABLE_SHARED_TRUE@ ;;
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
+-@ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
++@ENABLE_STATIC_TRUE@ echo -L${SYSROOT}@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
+ @ENABLE_STATIC_TRUE@ ;;
+ *)
+ echo "${usage}" 1>&2
+--
+1.7.7
+
diff --git a/patches/SDL-1.2.14/0002-fix-parallel-build.patch b/patches/SDL-1.2.14/0002-fix-parallel-build.patch
new file mode 100644
index 0000000..00f4a8d
--- /dev/null
+++ b/patches/SDL-1.2.14/0002-fix-parallel-build.patch
@@ -0,0 +1,28 @@
+From 1cbec744c03d82ebb520cd1efbfea1a5641e0cbd Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:49:04 +0200
+Subject: [PATCH 2/3] fix parallel build
+
+We have to create the objects dir before saving gcc's output into it.
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ Makefile.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e29dc6d..359ca12 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -75,7 +75,7 @@ depend:
+
+ include $(depend)
+
+-$(objects)/$(TARGET): $(OBJECTS)
++$(objects)/$(TARGET): $(OBJECTS) $(objects)
+ $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+
+ $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
+--
+1.7.7
+
diff --git a/patches/SDL-1.2.14/0003-fix-PPC-build.patch b/patches/SDL-1.2.14/0003-fix-PPC-build.patch
new file mode 100644
index 0000000..72495c3
--- /dev/null
+++ b/patches/SDL-1.2.14/0003-fix-PPC-build.patch
@@ -0,0 +1,68 @@
+From feb9de54dd41c9a3672fac6c3e30f4dbbe6e4b26 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:49:05 +0200
+Subject: [PATCH 3/3] fix PPC build
+
+From upstream SVN:
+------------------------------------------------------------------------
+Author: slouken
+Date: 2009-12-11 07:14:13 -0800 (Fri, 11 Dec 2009)
+New Revision: 5374
+
+Modified:
+ branches/SDL-1.2/configure.in
+Log:
+Fixed bug #895
+
+ Markus Rothe 2009-12-07 09:32:46 PST
+
+Check if libspe2 is available
+
+Building on PowerPC64 results in:
+
+[...]
+In file included from ./src/video/ps3/SDL_ps3events_c.h:33,
+ from ./src/video/ps3/SDL_ps3video.c:32:
+./src/video/ps3/SDL_ps3video.h:34:21: error: libspe2.h: No such file or
+directory
+In file included from ./src/video/ps3/SDL_ps3events_c.h:33,
+ from ./src/video/ps3/SDL_ps3video.c:32:
+./src/video/ps3/SDL_ps3video.h:75: error: expected specifier-qualifier-list
+before 'spe_context_ptr_t'
+./src/video/ps3/SDL_ps3video.c:78: error: expected '=', ',', ';', 'asm' or
+'__attribute__' before 'fb_writer_spu'
+./src/video/ps3/SDL_ps3video.c: In function 'PS3_VideoInit':
+./src/video/ps3/SDL_ps3video.c:167: error: 'spu_data_t' has no member named
+'program'
+./src/video/ps3/SDL_ps3video.c:167: error: 'fb_writer_spu' undeclared (first
+use in this function)
+[...]
+
+The problem is that the ps3 video driver is being build regardless if libspe2
+is installed or not. The attached patch fixes this problem.
+
+[ Note: The other headers that are being checked for are coming from the linux
+headers package on powerpc64. As a result these are also available if you're on
+a generic powerpc64 machine and not a PS3 only. ]
+------------------------------------------------------------------------
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ configure.in | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index a7e9b18..b99c186 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1317,6 +1317,7 @@ CheckPS3()
+ AC_TRY_COMPILE([
+ #include <linux/fb.h>
+ #include <asm/ps3fb.h>
++ #include <libspe2.h>
+ ],[
+ ],[
+ video_ps3=yes
+--
+1.7.7
+
diff --git a/patches/SDL-1.2.14/SDL-1.2.10-sdl-config.in.diff b/patches/SDL-1.2.14/SDL-1.2.10-sdl-config.in.diff
deleted file mode 100644
index b12655c..0000000
--- a/patches/SDL-1.2.14/SDL-1.2.10-sdl-config.in.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Subject teach sdl-config about sysroot
-
-Teach sdl-config the concept of sysroot, but disable manual prefix overwriting.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-
----
-# 20091210 rsc: is this patch ready for mainline?
-
- sdl-config.in | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-Index: SDL-1.2.13/sdl-config.in
-===================================================================
---- SDL-1.2.13.orig/sdl-config.in
-+++ SDL-1.2.13/sdl-config.in
-@@ -23,10 +23,10 @@ while test $# -gt 0; do
-
- case $1 in
- --prefix=*)
-- prefix=$optarg
-- if test $exec_prefix_set = no ; then
-- exec_prefix=$optarg
-- fi
-+# prefix=$optarg
-+# if test $exec_prefix_set = no ; then
-+# exec_prefix=$optarg
-+# fi
- ;;
- --prefix)
- echo $prefix
-@@ -42,14 +42,14 @@ while test $# -gt 0; do
- echo @SDL_VERSION@
- ;;
- --cflags)
-- echo -I@includedir@/SDL @SDL_CFLAGS@
-+ echo -I${SYSROOT}@includedir@/SDL @SDL_CFLAGS@
- ;;
- @ENABLE_SHARED_TRUE@ --libs)
--@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
-+@ENABLE_SHARED_TRUE@ echo -L${SYSROOT}@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
- @ENABLE_SHARED_TRUE@ ;;
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
--@ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
-+@ENABLE_STATIC_TRUE@ echo -L${SYSROOT}@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
- @ENABLE_STATIC_TRUE@ ;;
- *)
- echo "${usage}" 1>&2
diff --git a/patches/SDL-1.2.14/fix-parallel-build.diff b/patches/SDL-1.2.14/fix-parallel-build.diff
deleted file mode 100644
index 7df5224..0000000
--- a/patches/SDL-1.2.14/fix-parallel-build.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Subject: fix parallel build
-
-We have to create the objects dir before saving gcc's output into it.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: SDL-1.2.13/Makefile.in
-===================================================================
---- SDL-1.2.13.orig/Makefile.in
-+++ SDL-1.2.13/Makefile.in
-@@ -75,7 +75,7 @@ depend:
-
- include $(depend)
-
--$(objects)/$(TARGET): $(OBJECTS)
-+$(objects)/$(TARGET): $(OBJECTS) $(objects)
- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-
- $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
diff --git a/patches/SDL-1.2.14/fix-ppc-build.diff b/patches/SDL-1.2.14/fix-ppc-build.diff
deleted file mode 100644
index bf536c9..0000000
--- a/patches/SDL-1.2.14/fix-ppc-build.diff
+++ /dev/null
@@ -1,64 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: fix PPC build
-
-From upstream SVN:
-------------------------------------------------------------------------
-Author: slouken
-Date: 2009-12-11 07:14:13 -0800 (Fri, 11 Dec 2009)
-New Revision: 5374
-
-Modified:
- branches/SDL-1.2/configure.in
-Log:
-Fixed bug #895
-
- Markus Rothe 2009-12-07 09:32:46 PST
-
-Check if libspe2 is available
-
-Building on PowerPC64 results in:
-
-[...]
-In file included from ./src/video/ps3/SDL_ps3events_c.h:33,
- from ./src/video/ps3/SDL_ps3video.c:32:
-./src/video/ps3/SDL_ps3video.h:34:21: error: libspe2.h: No such file or
-directory
-In file included from ./src/video/ps3/SDL_ps3events_c.h:33,
- from ./src/video/ps3/SDL_ps3video.c:32:
-./src/video/ps3/SDL_ps3video.h:75: error: expected specifier-qualifier-list
-before 'spe_context_ptr_t'
-./src/video/ps3/SDL_ps3video.c:78: error: expected '=', ',', ';', 'asm' or
-'__attribute__' before 'fb_writer_spu'
-./src/video/ps3/SDL_ps3video.c: In function 'PS3_VideoInit':
-./src/video/ps3/SDL_ps3video.c:167: error: 'spu_data_t' has no member named
-'program'
-./src/video/ps3/SDL_ps3video.c:167: error: 'fb_writer_spu' undeclared (first
-use in this function)
-[...]
-
-The problem is that the ps3 video driver is being build regardless if libspe2
-is installed or not. The attached patch fixes this problem.
-
-[ Note: The other headers that are being checked for are coming from the linux
-headers package on powerpc64. As a result these are also available if you're on
-a generic powerpc64 machine and not a PS3 only. ]
-------------------------------------------------------------------------
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-
----
- configure.in | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: b/configure.in
-===================================================================
---- a/configure.in
-+++ b/configure.in
-@@ -1317,6 +1317,7 @@ CheckPS3()
- AC_TRY_COMPILE([
- #include <linux/fb.h>
- #include <asm/ps3fb.h>
-+ #include <libspe2.h>
- ],[
- ],[
- video_ps3=yes
diff --git a/patches/SDL-1.2.14/series b/patches/SDL-1.2.14/series
deleted file mode 100644
index e5d4d7b..0000000
--- a/patches/SDL-1.2.14/series
+++ /dev/null
@@ -1,3 +0,0 @@
-SDL-1.2.10-sdl-config.in.diff
-fix-parallel-build.diff
-fix-ppc-build.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 06/28] sdl-mixer: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (3 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 05/28] sdl: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 07/28] atop: " Robert Schwebel
` (21 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
.../SDL_mixer-1.2.11/0001-fix-parallel-build.patch | 46 +++++++++++++++++++
.../0002-fix-cross-compiling-issue.patch | 43 ++++++++++++++++++
patches/SDL_mixer-1.2.11/fix-cross-compiling.diff | 39 ----------------
patches/SDL_mixer-1.2.11/fix-parallel-build.diff | 47 --------------------
patches/SDL_mixer-1.2.11/series | 2 -
5 files changed, 89 insertions(+), 88 deletions(-)
create mode 100644 patches/SDL_mixer-1.2.11/0001-fix-parallel-build.patch
create mode 100644 patches/SDL_mixer-1.2.11/0002-fix-cross-compiling-issue.patch
delete mode 100644 patches/SDL_mixer-1.2.11/fix-cross-compiling.diff
delete mode 100644 patches/SDL_mixer-1.2.11/fix-parallel-build.diff
delete mode 100644 patches/SDL_mixer-1.2.11/series
diff --git a/patches/SDL_mixer-1.2.11/0001-fix-parallel-build.patch b/patches/SDL_mixer-1.2.11/0001-fix-parallel-build.patch
new file mode 100644
index 0000000..dd2fb7e
--- /dev/null
+++ b/patches/SDL_mixer-1.2.11/0001-fix-parallel-build.patch
@@ -0,0 +1,46 @@
+From a95ef6e2f9a97a0a2af6dcdd1dacd91fb213da14 Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:51:39 +0200
+Subject: [PATCH 1/2] fix parallel build
+
+We have to create the objects dir before saving gcc's output into it.
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+Signed-off-by: Robert Schwebel <rsc@pengutronix.de>
+---
+ Makefile.in | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 76fdd3c..26961b7 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -71,13 +71,13 @@ $(objects):
+ -include $(PLAYMUS_OBJECTS:.lo=.d)
+ @PLAYMUS_DEPENDS@
+
+-$(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
++$(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) $(objects)
+ $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+
+-$(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET)
++$(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET) $(objects)
+ $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
+
+-$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET)
++$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET) $(objects)
+ $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
+
+ install: all install-hdrs install-lib #install-bin
+@@ -92,7 +92,7 @@ install-hdrs:
+ install-lib: $(objects) $(objects)/$(TARGET)
+ $(SHELL) $(auxdir)/mkinstalldirs $(libdir)
+ $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET)
+-install-bin:
++install-bin: $(objects)
+ $(SHELL) $(auxdir)/mkinstalldirs $(bindir)
+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(objects)/playwave$(EXE) $(bindir)/playwave$(EXE)
+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(objects)/playmus$(EXE) $(bindir)/playmus$(EXE)
+--
+1.7.7
+
diff --git a/patches/SDL_mixer-1.2.11/0002-fix-cross-compiling-issue.patch b/patches/SDL_mixer-1.2.11/0002-fix-cross-compiling-issue.patch
new file mode 100644
index 0000000..d1af1c8
--- /dev/null
+++ b/patches/SDL_mixer-1.2.11/0002-fix-cross-compiling-issue.patch
@@ -0,0 +1,43 @@
+From 3b6f7fb6dda3449f5e6721c5a26ebad913c47c28 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:51:39 +0200
+Subject: [PATCH 2/2] fix cross-compiling issue
+
+use AC_COMPILE_IFELSE instead of AC_TRY_RUN
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.in | 14 ++++++++------
+ 1 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 7d23387..a3f440b 100644
+--- a/configure.in
++++ b/configure.in
+@@ -417,15 +417,17 @@ if test x$enable_music_flac = xyes; then
+ LIBS_SAVED="$LIBS"
+ LIBS="-lFLAC"
+ AC_MSG_CHECKING([for libflac so-name version >= $libflac_ver])
+- AC_TRY_RUN([
++ AC_COMPILE_IFELSE([
+ #include "FLAC/export.h"
+-#include "stdio.h"
++
++#ifndef FLAC_API_VERSION_CURRENT
++#error no version
++#endif
++#if FLAC_API_VERSION_CURRENT < $libflac_ver
++#error too old
++#endif
+ int main( int argc, char *argv[] ) {
+-#if defined(FLAC_API_VERSION_CURRENT) && (FLAC_API_VERSION_CURRENT >= $libflac_ver)
+ return 0;
+-#else
+- return 1;
+-#endif
+ }
+ ], have_flac_ver=yes, have_flac_ver=no)
+ LIBS="$LIBS_SAVED"
+--
+1.7.7
+
diff --git a/patches/SDL_mixer-1.2.11/fix-cross-compiling.diff b/patches/SDL_mixer-1.2.11/fix-cross-compiling.diff
deleted file mode 100644
index 0e3399f..0000000
--- a/patches/SDL_mixer-1.2.11/fix-cross-compiling.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: fix cross-compiling issue
-
-use AC_COMPILE_IFELSE instead of AC_TRY_RUN
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- configure.in | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-Index: b/configure.in
-===================================================================
---- a/configure.in
-+++ b/configure.in
-@@ -417,15 +417,17 @@ if test x$enable_music_flac = xyes; then
- LIBS_SAVED="$LIBS"
- LIBS="-lFLAC"
- AC_MSG_CHECKING([for libflac so-name version >= $libflac_ver])
-- AC_TRY_RUN([
-+ AC_COMPILE_IFELSE([
- #include "FLAC/export.h"
--#include "stdio.h"
-+
-+#ifndef FLAC_API_VERSION_CURRENT
-+#error no version
-+#endif
-+#if FLAC_API_VERSION_CURRENT < $libflac_ver
-+#error too old
-+#endif
- int main( int argc, char *argv[] ) {
--#if defined(FLAC_API_VERSION_CURRENT) && (FLAC_API_VERSION_CURRENT >= $libflac_ver)
- return 0;
--#else
-- return 1;
--#endif
- }
- ], have_flac_ver=yes, have_flac_ver=no)
- LIBS="$LIBS_SAVED"
diff --git a/patches/SDL_mixer-1.2.11/fix-parallel-build.diff b/patches/SDL_mixer-1.2.11/fix-parallel-build.diff
deleted file mode 100644
index 7130df1..0000000
--- a/patches/SDL_mixer-1.2.11/fix-parallel-build.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Subject: fix parallel build
-
-We have to create the objects dir before saving gcc's output into it.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-Signed-off-by: Robert Schwebel <rsc@pengutronix.de>
----
-V2:
- rsc: ported to 1.2.11
-
-V1:
- mkl: patch for 1.2.8
-
- Makefile.in | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-Index: SDL_mixer-1.2.11/Makefile.in
-===================================================================
---- SDL_mixer-1.2.11.orig/Makefile.in
-+++ SDL_mixer-1.2.11/Makefile.in
-@@ -71,13 +71,13 @@ $(objects):
- -include $(PLAYMUS_OBJECTS:.lo=.d)
- @PLAYMUS_DEPENDS@
-
--$(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
-+$(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) $(objects)
- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-
--$(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET)
-+$(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET) $(objects)
- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
-
--$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET)
-+$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET) $(objects)
- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
-
- install: all install-hdrs install-lib #install-bin
-@@ -92,7 +92,7 @@ install-hdrs:
- install-lib: $(objects) $(objects)/$(TARGET)
- $(SHELL) $(auxdir)/mkinstalldirs $(libdir)
- $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET)
--install-bin:
-+install-bin: $(objects)
- $(SHELL) $(auxdir)/mkinstalldirs $(bindir)
- $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(objects)/playwave$(EXE) $(bindir)/playwave$(EXE)
- $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(objects)/playmus$(EXE) $(bindir)/playmus$(EXE)
diff --git a/patches/SDL_mixer-1.2.11/series b/patches/SDL_mixer-1.2.11/series
deleted file mode 100644
index 98808fa..0000000
--- a/patches/SDL_mixer-1.2.11/series
+++ /dev/null
@@ -1,2 +0,0 @@
-fix-parallel-build.diff
-fix-cross-compiling.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 07/28] atop: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (4 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 06/28] sdl-mixer: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 08/28] bing: " Robert Schwebel
` (20 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
patches/atop-1.24/0001-Fix-crosscompilation.patch | 40 +++++++++++++++++++++
patches/atop-1.24/fix-cross-compile.patch | 38 -------------------
patches/atop-1.24/series | 1 -
3 files changed, 40 insertions(+), 39 deletions(-)
create mode 100644 patches/atop-1.24/0001-Fix-crosscompilation.patch
delete mode 100644 patches/atop-1.24/fix-cross-compile.patch
delete mode 100644 patches/atop-1.24/series
diff --git a/patches/atop-1.24/0001-Fix-crosscompilation.patch b/patches/atop-1.24/0001-Fix-crosscompilation.patch
new file mode 100644
index 0000000..952916f
--- /dev/null
+++ b/patches/atop-1.24/0001-Fix-crosscompilation.patch
@@ -0,0 +1,40 @@
+From 63f4c95124e237b0dac0ca4d3cf65d0ae7079daf Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:53:38 +0200
+Subject: [PATCH] Fix crosscompilation
+
+This patch fixes cross compilation, of another handcrafted
+Makefile.
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ Makefile | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 669cbcd..f4c4868 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,8 +15,8 @@ CRNPATH = /etc/cron.d
+ ROTPATH = /etc/logrotate.d
+
+ # CFLAGS = -g -I. -Wall # -DHTTPSTATS
+-CFLAGS = -O -I. -Wall # -DHTTPSTATS
+-LDFLAGS = -lncurses -lm -lz
++CFLAGS += -O2 -I. -Wall # -DHTTPSTATS
++LDFLAGS += -lncurses -lm -lz
+ OBJMOD0 = version.o
+ OBJMOD1 = various.o deviate.o procdbase.o
+ OBJMOD2 = acctproc.o photoproc.o photosyst.o rawlog.o ifprop.o parseable.o
+@@ -27,7 +27,7 @@ ALLMODS = $(OBJMOD0) $(OBJMOD1) $(OBJMOD2) $(OBJMOD3) $(OBJMOD4)
+ all: atop
+
+ atop: atop.o $(ALLMODS) Makefile
+- cc atop.o $(ALLMODS) -o atop $(LDFLAGS)
++ $(CC) atop.o $(ALLMODS) -o atop $(LDFLAGS)
+
+ clean:
+ rm -f *.o
+--
+1.7.7
+
diff --git a/patches/atop-1.24/fix-cross-compile.patch b/patches/atop-1.24/fix-cross-compile.patch
deleted file mode 100644
index e325c7a..0000000
--- a/patches/atop-1.24/fix-cross-compile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Subject: Fix crosscompilation
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-
-This patch fixes cross compilation, of another handcrafted
-Makefile.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-
----
-#20081125: wsa: Mailed to upstream.
-#20081127: wsa: Accepted upstream. Wait for next release.
-#20100317: mkl: Mailed to upstream again.
-
- Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -15,8 +15,8 @@ CRNPATH = /etc/cron.d
- ROTPATH = /etc/logrotate.d
-
- # CFLAGS = -g -I. -Wall # -DHTTPSTATS
--CFLAGS = -O -I. -Wall # -DHTTPSTATS
--LDFLAGS = -lncurses -lm -lz
-+CFLAGS += -O2 -I. -Wall # -DHTTPSTATS
-+LDFLAGS += -lncurses -lm -lz
- OBJMOD0 = version.o
- OBJMOD1 = various.o deviate.o procdbase.o
- OBJMOD2 = acctproc.o photoproc.o photosyst.o rawlog.o ifprop.o parseable.o
-@@ -27,7 +27,7 @@ ALLMODS = $(OBJMOD0) $(OBJMOD1) $(OBJMOD
- all: atop
-
- atop: atop.o $(ALLMODS) Makefile
-- cc atop.o $(ALLMODS) -o atop $(LDFLAGS)
-+ $(CC) atop.o $(ALLMODS) -o atop $(LDFLAGS)
-
- clean:
- rm -f *.o
diff --git a/patches/atop-1.24/series b/patches/atop-1.24/series
deleted file mode 100644
index 0190994..0000000
--- a/patches/atop-1.24/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-cross-compile.patch
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 08/28] bing: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (5 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 07/28] atop: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 09/28] bridge-utils: " Robert Schwebel
` (19 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
...pt-makefile-for-Linux-add-destdir-support.patch | 66 +++++++++++
.../bing_src-1.1.3/0002-bing_1.1.3-2.diff.patch | 121 ++++++++++++++++++++
.../bing_src-1.1.3/adapt_makefile_for_linux.diff | 64 ----------
patches/bing_src-1.1.3/bing_1.1.3-2.diff | 109 ------------------
patches/bing_src-1.1.3/series | 2 -
5 files changed, 187 insertions(+), 175 deletions(-)
create mode 100644 patches/bing_src-1.1.3/0001-Adapt-makefile-for-Linux-add-destdir-support.patch
create mode 100644 patches/bing_src-1.1.3/0002-bing_1.1.3-2.diff.patch
delete mode 100644 patches/bing_src-1.1.3/adapt_makefile_for_linux.diff
delete mode 100644 patches/bing_src-1.1.3/bing_1.1.3-2.diff
delete mode 100644 patches/bing_src-1.1.3/series
diff --git a/patches/bing_src-1.1.3/0001-Adapt-makefile-for-Linux-add-destdir-support.patch b/patches/bing_src-1.1.3/0001-Adapt-makefile-for-Linux-add-destdir-support.patch
new file mode 100644
index 0000000..745704f
--- /dev/null
+++ b/patches/bing_src-1.1.3/0001-Adapt-makefile-for-Linux-add-destdir-support.patch
@@ -0,0 +1,66 @@
+From 46a7925ba445f1e92dfb467bd714073ea5c1459f Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:55:06 +0200
+Subject: [PATCH 1/2] Adapt makefile for Linux, add destdir support
+
+Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ Makefile | 16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 0964851..4281cb4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -9,9 +9,9 @@
+ #
+ ##########
+
+-BINDIR=/usr/local/bin
+-MANDIR=/usr/local/man
+-
++PREFIX ?= /usr
++BINDIR = $(PREFIX)/sbin
++MANDIR = $(PREFIX)/man
+
+ ##########
+ #
+@@ -21,7 +21,7 @@ MANDIR=/usr/local/man
+
+ # Uncomment if you need the 4.4 BSD compatibility includes.
+ # -> required on Linux (and Win32)
+-#COMPAT_INCS = -Iinclude
++COMPAT_INCS = -Iinclude
+
+ # Maybe specify some specific compatibility options
+ # -> on AIX activate the BSD mode
+@@ -37,7 +37,7 @@ MANDIR=/usr/local/man
+
+ # Define to use srandom/random rather than srand/rand
+ # -> required on SunOS 4.1.3, SunOS 5, AIX 2 (BOSX 2 really), OSF1 V2.0
+-NO_SNPRINTF = -DNO_SNPRINTF=1
++#NO_SNPRINTF = -DNO_SNPRINTF=1
+
+ # Define if you lack strerror()
+ #NO_STRERROR = -DNO_STRERROR=1
+@@ -47,7 +47,7 @@ NO_SNPRINTF = -DNO_SNPRINTF=1
+ # -> if you want to debug bing define
+ #COPTIM = -g
+ # -> on Linux, SunOS 4 and OSF1 V2.0 you may specify
+-#COPTIM = -O2
++COPTIM = -O2
+ # -> on Solaris you may use
+ #COPTIM = -O
+ # on some hosts like AIX, HP-UX the optimisation options are already set
+@@ -109,5 +109,5 @@ clean:
+ $(RM) -f bing bing.ps bing.0 $(OBJS)
+
+ install: bing unix/bing.8
+- $(INSTALL) -m 644 -o man -g man unix/bing.8 $(MANDIR)/man8
+- $(INSTALL) -m 4555 -o root -g staff bing $(BINDIR)
++ $(INSTALL) -m 644 unix/bing.8 $(DESTDIR)$(MANDIR)/man8
++ $(INSTALL) -m 4555 -o root bing $(DESTDIR)$(BINDIR)
+--
+1.7.7
+
diff --git a/patches/bing_src-1.1.3/0002-bing_1.1.3-2.diff.patch b/patches/bing_src-1.1.3/0002-bing_1.1.3-2.diff.patch
new file mode 100644
index 0000000..5ccd6d5
--- /dev/null
+++ b/patches/bing_src-1.1.3/0002-bing_1.1.3-2.diff.patch
@@ -0,0 +1,121 @@
+From 6e62471f30d379a9592ed2e68c65b5a468191bce Mon Sep 17 00:00:00 2001
+From: unknown author <unknown.author@example.com>
+Date: Sat, 29 Oct 2011 18:55:06 +0200
+Subject: [PATCH 2/2] bing_1.1.3-2.diff
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ bing.c | 63 ++++++++++++++++++++++++++++++---------------------------------
+ 1 files changed, 30 insertions(+), 33 deletions(-)
+
+diff --git a/bing.c b/bing.c
+index aa078f9..e1094e9 100644
+--- a/bing.c
++++ b/bing.c
+@@ -104,7 +104,9 @@ static char rcsid[] = "$Id: bing.c,v 1.17 1997/01/23 21:00:03 pb Exp $";
+ #include <math.h>
+
+ /* More specific includes/declarations */
++#ifndef __GNU__
+ #include <limits.h>
++#endif /* __GNU__ */
+ #include <ctype.h>
+ #include <string.h>
+ #include <memory.h>
+@@ -152,7 +154,9 @@ char* __progname;
+ * standard libraries.
+ */
+ #include <netinet/ip.h>
++#ifndef __GNU__
+ #include <netinet/ip_var.h>
++#endif /* __GNU__ */
+ #include <netinet/ip_icmp.h>
+
+ #include "mod_icmp.h"
+@@ -320,9 +324,7 @@ struct timestats {
+
+ struct hoststats {
+ /* Host info */
+- char hnamebuf[MAXHOSTNAMELEN];
+ char *hostname;
+- struct sockaddr_in whereto;
+ struct sockaddr_in *to;
+ struct timestats *ts;
+ };
+@@ -365,28 +367,19 @@ void set_ip(hs, target)
+ struct hoststats *hs;
+ char *target;
+ {
+- struct hostent *hp;
++ struct addrinfo hints, *ai;
++ int r;
+
+- hs->to = &hs->whereto;
+-
+- memset((char *)hs->to, 0, sizeof(struct sockaddr_in));
+- hs->to->sin_family = AF_INET;
+- hs->to->sin_addr.s_addr = inet_addr(target);
+- if (hs->to->sin_addr.s_addr != (u_int)-1)
+- hs->hostname = target;
+- else {
+- hp = gethostbyname(target);
+- if (!hp) {
+- (void)fprintf(stderr,
+- "bing: unknown host %s\n", target);
+- exit(1);
+- }
+- hs->to->sin_family = hp->h_addrtype;
+- memcpy((caddr_t)&hs->to->sin_addr, hp->h_addr, hp->h_length);
+- strncpy(hs->hnamebuf, hp->h_name, sizeof(hs->hnamebuf) - 1);
+- hs->hnamebuf[sizeof(hs->hnamebuf)-1] = '\0';
+- hs->hostname = hs->hnamebuf;
++ memset(&hints, 0, sizeof hints);
++ hints.ai_family = AF_INET;
++ hints.ai_flags = AI_CANONNAME;
++ if((r = getaddrinfo(target, NULL, &hints, &ai))) {
++ fprintf(stderr, "bing: couldn't resolve %s: %s\n",
++ target, gai_strerror(r));
++ exit(1);
+ }
++ hs->to = (struct sockaddr_in *) ai->ai_addr;
++ hs->hostname = ai->ai_canonname;
+ }
+
+ void randomfill(bp, len, seed)
+@@ -677,18 +670,22 @@ char *
+ pr_addr(l)
+ u_long l;
+ {
+- struct hostent *hp;
+- static char buf[80];
++ static char buf[MAXHOSTNAMELEN+19];
++ struct sockaddr_in sa;
++ int r;
+
+- if ((options & F_NUMERIC) ||
+- !(hp = gethostbyaddr((char *)&l, 4, AF_INET)))
+- (void)snprintf(snfargs(buf, sizeof(buf), "%s"),
+- inet_ntoa(*(struct in_addr *)&l));
+- else
+- (void)snprintf(snfargs(buf, sizeof(buf), "%s (%s)"),
+- hp->h_name,
+- inet_ntoa(*(struct in_addr *)&l));
+- return(buf);
++ sa.sin_family = AF_INET;
++ sa.sin_port = 0;
++ memcpy(&sa.sin_addr, &l, sizeof l);
++
++ r = getnameinfo((struct sockaddr *) &sa, sizeof sa, buf, sizeof buf,
++ NULL, 0, (options & F_NUMERIC) ? NI_NUMERICHOST : 0);
++ if(r) {
++ fprintf(stderr, "bing: getaddrinfo: %s\n", gai_strerror(r));
++ exit(1);
++ }
++
++ return buf;
+ }
+
+ /*
+--
+1.7.7
+
diff --git a/patches/bing_src-1.1.3/adapt_makefile_for_linux.diff b/patches/bing_src-1.1.3/adapt_makefile_for_linux.diff
deleted file mode 100644
index cb25b4b..0000000
--- a/patches/bing_src-1.1.3/adapt_makefile_for_linux.diff
+++ /dev/null
@@ -1,64 +0,0 @@
-From: Wolfram Sang <w.sang@pengutronix.de>
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Subject: Adapt makefile for Linux, add destdir support
-
-Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
-# 20081124: wsa: there is no upstream anymore :(
-
- Makefile | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-Index: Makefile
-===================================================================
---- Makefile.orig
-+++ Makefile
-@@ -9,9 +9,9 @@
- #
- ##########
-
--BINDIR=/usr/local/bin
--MANDIR=/usr/local/man
--
-+PREFIX ?= /usr
-+BINDIR = $(PREFIX)/sbin
-+MANDIR = $(PREFIX)/man
-
- ##########
- #
-@@ -21,7 +21,7 @@ MANDIR=/usr/local/man
-
- # Uncomment if you need the 4.4 BSD compatibility includes.
- # -> required on Linux (and Win32)
--#COMPAT_INCS = -Iinclude
-+COMPAT_INCS = -Iinclude
-
- # Maybe specify some specific compatibility options
- # -> on AIX activate the BSD mode
-@@ -37,7 +37,7 @@ MANDIR=/usr/local/man
-
- # Define to use srandom/random rather than srand/rand
- # -> required on SunOS 4.1.3, SunOS 5, AIX 2 (BOSX 2 really), OSF1 V2.0
--NO_SNPRINTF = -DNO_SNPRINTF=1
-+#NO_SNPRINTF = -DNO_SNPRINTF=1
-
- # Define if you lack strerror()
- #NO_STRERROR = -DNO_STRERROR=1
-@@ -47,7 +47,7 @@ NO_SNPRINTF = -DNO_SNPRINTF=1
- # -> if you want to debug bing define
- #COPTIM = -g
- # -> on Linux, SunOS 4 and OSF1 V2.0 you may specify
--#COPTIM = -O2
-+COPTIM = -O2
- # -> on Solaris you may use
- #COPTIM = -O
- # on some hosts like AIX, HP-UX the optimisation options are already set
-@@ -109,5 +109,5 @@ clean:
- $(RM) -f bing bing.ps bing.0 $(OBJS)
-
- install: bing unix/bing.8
-- $(INSTALL) -m 644 -o man -g man unix/bing.8 $(MANDIR)/man8
-- $(INSTALL) -m 4555 -o root -g staff bing $(BINDIR)
-+ $(INSTALL) -m 644 unix/bing.8 $(DESTDIR)$(MANDIR)/man8
-+ $(INSTALL) -m 4555 -o root bing $(DESTDIR)$(BINDIR)
diff --git a/patches/bing_src-1.1.3/bing_1.1.3-2.diff b/patches/bing_src-1.1.3/bing_1.1.3-2.diff
deleted file mode 100644
index 3e50174..0000000
--- a/patches/bing_src-1.1.3/bing_1.1.3-2.diff
+++ /dev/null
@@ -1,109 +0,0 @@
-From: http://ftp.de.debian.org/debian/pool/main/b/bing/bing_1.1.3-2.diff.gz
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---- bing-1.1.3.orig/bing.c
-+++ bing-1.1.3/bing.c
-@@ -104,7 +104,9 @@
- #include <math.h>
-
- /* More specific includes/declarations */
-+#ifndef __GNU__
- #include <limits.h>
-+#endif /* __GNU__ */
- #include <ctype.h>
- #include <string.h>
- #include <memory.h>
-@@ -152,7 +154,9 @@
- * standard libraries.
- */
- #include <netinet/ip.h>
-+#ifndef __GNU__
- #include <netinet/ip_var.h>
-+#endif /* __GNU__ */
- #include <netinet/ip_icmp.h>
-
- #include "mod_icmp.h"
-@@ -320,9 +324,7 @@
-
- struct hoststats {
- /* Host info */
-- char hnamebuf[MAXHOSTNAMELEN];
- char *hostname;
-- struct sockaddr_in whereto;
- struct sockaddr_in *to;
- struct timestats *ts;
- };
-@@ -365,28 +367,19 @@
- struct hoststats *hs;
- char *target;
- {
-- struct hostent *hp;
-+ struct addrinfo hints, *ai;
-+ int r;
-
-- hs->to = &hs->whereto;
--
-- memset((char *)hs->to, 0, sizeof(struct sockaddr_in));
-- hs->to->sin_family = AF_INET;
-- hs->to->sin_addr.s_addr = inet_addr(target);
-- if (hs->to->sin_addr.s_addr != (u_int)-1)
-- hs->hostname = target;
-- else {
-- hp = gethostbyname(target);
-- if (!hp) {
-- (void)fprintf(stderr,
-- "bing: unknown host %s\n", target);
-- exit(1);
-- }
-- hs->to->sin_family = hp->h_addrtype;
-- memcpy((caddr_t)&hs->to->sin_addr, hp->h_addr, hp->h_length);
-- strncpy(hs->hnamebuf, hp->h_name, sizeof(hs->hnamebuf) - 1);
-- hs->hnamebuf[sizeof(hs->hnamebuf)-1] = '\0';
-- hs->hostname = hs->hnamebuf;
-+ memset(&hints, 0, sizeof hints);
-+ hints.ai_family = AF_INET;
-+ hints.ai_flags = AI_CANONNAME;
-+ if((r = getaddrinfo(target, NULL, &hints, &ai))) {
-+ fprintf(stderr, "bing: couldn't resolve %s: %s\n",
-+ target, gai_strerror(r));
-+ exit(1);
- }
-+ hs->to = (struct sockaddr_in *) ai->ai_addr;
-+ hs->hostname = ai->ai_canonname;
- }
-
- void randomfill(bp, len, seed)
-@@ -677,18 +670,22 @@
- pr_addr(l)
- u_long l;
- {
-- struct hostent *hp;
-- static char buf[80];
-+ static char buf[MAXHOSTNAMELEN+19];
-+ struct sockaddr_in sa;
-+ int r;
-+
-+ sa.sin_family = AF_INET;
-+ sa.sin_port = 0;
-+ memcpy(&sa.sin_addr, &l, sizeof l);
-+
-+ r = getnameinfo((struct sockaddr *) &sa, sizeof sa, buf, sizeof buf,
-+ NULL, 0, (options & F_NUMERIC) ? NI_NUMERICHOST : 0);
-+ if(r) {
-+ fprintf(stderr, "bing: getaddrinfo: %s\n", gai_strerror(r));
-+ exit(1);
-+ }
-
-- if ((options & F_NUMERIC) ||
-- !(hp = gethostbyaddr((char *)&l, 4, AF_INET)))
-- (void)snprintf(snfargs(buf, sizeof(buf), "%s"),
-- inet_ntoa(*(struct in_addr *)&l));
-- else
-- (void)snprintf(snfargs(buf, sizeof(buf), "%s (%s)"),
-- hp->h_name,
-- inet_ntoa(*(struct in_addr *)&l));
-- return(buf);
-+ return buf;
- }
-
- /*
diff --git a/patches/bing_src-1.1.3/series b/patches/bing_src-1.1.3/series
deleted file mode 100644
index c6b8048..0000000
--- a/patches/bing_src-1.1.3/series
+++ /dev/null
@@ -1,2 +0,0 @@
-adapt_makefile_for_linux.diff -p0
-bing_1.1.3-2.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 09/28] bridge-utils: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (6 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 08/28] bing: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 10/28] bzip2: " Robert Schwebel
` (18 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
...0001-add-dummy-patch-to-enable-autogen.sh.patch | 26 ++++++++++++++++++++
.../bridge-utils-1.5/bridge-utils-1.4-dummy.diff | 18 -------------
patches/bridge-utils-1.5/series | 1 -
3 files changed, 26 insertions(+), 19 deletions(-)
create mode 100644 patches/bridge-utils-1.5/0001-add-dummy-patch-to-enable-autogen.sh.patch
delete mode 100644 patches/bridge-utils-1.5/bridge-utils-1.4-dummy.diff
delete mode 100644 patches/bridge-utils-1.5/series
diff --git a/patches/bridge-utils-1.5/0001-add-dummy-patch-to-enable-autogen.sh.patch b/patches/bridge-utils-1.5/0001-add-dummy-patch-to-enable-autogen.sh.patch
new file mode 100644
index 0000000..611e187
--- /dev/null
+++ b/patches/bridge-utils-1.5/0001-add-dummy-patch-to-enable-autogen.sh.patch
@@ -0,0 +1,26 @@
+From 96df5d11cf02ff3771d8fbbedbab37b74b81ad3f Mon Sep 17 00:00:00 2001
+From: unknown author <unknown.author@example.com>
+Date: Sat, 29 Oct 2011 18:58:04 +0200
+Subject: [PATCH] add dummy patch to enable autogen.sh
+
+See patch below ... not for upstream.
+
+Not-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ README.ptx | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+ create mode 100644 README.ptx
+
+diff --git a/README.ptx b/README.ptx
+new file mode 100644
+index 0000000..08a6ac9
+--- /dev/null
++++ b/README.ptx
+@@ -0,0 +1,4 @@
++This is a dummy patch; with a patch, it is possible to run autogen.sh
++from ptxdist.
++
++-rsc
+--
+1.7.7
+
diff --git a/patches/bridge-utils-1.5/bridge-utils-1.4-dummy.diff b/patches/bridge-utils-1.5/bridge-utils-1.4-dummy.diff
deleted file mode 100644
index 370e4ad..0000000
--- a/patches/bridge-utils-1.5/bridge-utils-1.4-dummy.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Subject: [bridge-utils] add dummy patch to enable autogen.sh
-
-See patch below ... not for upstream.
-
-Not-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
----
- README.ptx | 4 ++++
- 1 file changed, 4 insertions(+)
-
-Index: bridge-utils-1.4/README.ptx
-===================================================================
---- /dev/null
-+++ bridge-utils-1.4/README.ptx
-@@ -0,0 +1,4 @@
-+This is a dummy patch; with a patch, it is possible to run autogen.sh
-+from ptxdist.
-+
-+-rsc
diff --git a/patches/bridge-utils-1.5/series b/patches/bridge-utils-1.5/series
deleted file mode 100644
index cdc6d84..0000000
--- a/patches/bridge-utils-1.5/series
+++ /dev/null
@@ -1 +0,0 @@
-bridge-utils-1.4-dummy.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 10/28] bzip2: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (7 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 09/28] bridge-utils: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 11/28] cbmbasic: " Robert Schwebel
` (17 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
patches/bzip2-1.0.5/0001-fixup-Makefile.patch | 209 +++++++++++++++++++++++++
patches/bzip2-1.0.5/bzip2-1.0.5_Makefile.diff | 207 ------------------------
patches/bzip2-1.0.5/series | 1 -
3 files changed, 209 insertions(+), 208 deletions(-)
create mode 100644 patches/bzip2-1.0.5/0001-fixup-Makefile.patch
delete mode 100644 patches/bzip2-1.0.5/bzip2-1.0.5_Makefile.diff
delete mode 100644 patches/bzip2-1.0.5/series
diff --git a/patches/bzip2-1.0.5/0001-fixup-Makefile.patch b/patches/bzip2-1.0.5/0001-fixup-Makefile.patch
new file mode 100644
index 0000000..a11d857
--- /dev/null
+++ b/patches/bzip2-1.0.5/0001-fixup-Makefile.patch
@@ -0,0 +1,209 @@
+From 6acc3dd29e3e588d445efc7c1c7e94059f688c89 Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:59:40 +0200
+Subject: [PATCH] fixup Makefile
+
+This patch fixes various problems in the makefile and disables compile
+time test. It was taken from Debinan.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ Makefile | 134 ++++++++++++++++++++++++++++++++------------------------------
+ 1 files changed, 69 insertions(+), 65 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index eb09753..8b1bf77 100644
+--- a/Makefile
++++ b/Makefile
+@@ -12,6 +12,8 @@
+ # in the file LICENSE.
+ # ------------------------------------------------------------------
+
++somajor=1.0
++sominor=$(somajor).4
+ SHELL=/bin/sh
+
+ # To assist in cross-compiling
+@@ -21,7 +23,7 @@ RANLIB=ranlib
+ LDFLAGS=
+
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
++CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) $(DEBCFLAGS)
+
+ # Where you want it installed when you do 'make install'
+ PREFIX=/usr/local
+@@ -35,9 +37,9 @@ OBJS= blocksort.o \
+ decompress.o \
+ bzlib.o
+
+-all: libbz2.a bzip2 bzip2recover test
++all: libbz2.a bzip2 bzip2recover # test
+
+-bzip2: libbz2.a bzip2.o
++bzip2: libbz2.so bzip2.o
+ $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
+
+ bzip2recover: bzip2recover.o
+@@ -46,20 +48,42 @@ bzip2recover: bzip2recover.o
+ libbz2.a: $(OBJS)
+ rm -f libbz2.a
+ $(AR) cq libbz2.a $(OBJS)
+- @if ( test -f $(RANLIB) -o -f /usr/bin/ranlib -o \
+- -f /bin/ranlib -o -f /usr/ccs/bin/ranlib ) ; then \
++ @if ( test -f $(RANLIB) || test -f /usr/bin/ranlib || \
++ test -f /bin/ranlib || test -f /usr/ccs/bin/ranlib ) ; then \
+ echo $(RANLIB) libbz2.a ; \
+ $(RANLIB) libbz2.a ; \
+ fi
+
++libbz2.so: libbz2.so.$(somajor)
++ ln -sf $^ $@
++
++libbz2.so.$(somajor): libbz2.so.$(sominor)
++ ln -sf $^ $@
++
++libbz2.so.$(sominor): $(OBJS:%.o=%.sho)
++ $(CC) -o libbz2.so.$(sominor) -shared \
++ -Wl,-soname,libbz2.so.$(somajor) $^ -lc
++
++%.sho: %.c
++ $(CC) $(CFLAGS) -D_REENTRANT -fPIC -o $@ -c $<
++
++%.o: %.c
++ $(CC) $(CFLAGS) -D_REENTRANT -o $@ -c $<
++
+ check: test
+ test: bzip2
+ @cat words1
++ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
+ ./bzip2 -1 < sample1.ref > sample1.rb2
++ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
+ ./bzip2 -2 < sample2.ref > sample2.rb2
++ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
+ ./bzip2 -3 < sample3.ref > sample3.rb2
++ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
+ ./bzip2 -d < sample1.bz2 > sample1.tst
++ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
+ ./bzip2 -d < sample2.bz2 > sample2.tst
++ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
+ ./bzip2 -ds < sample3.bz2 > sample3.tst
+ cmp sample1.bz2 sample1.rb2
+ cmp sample2.bz2 sample2.rb2
+@@ -69,73 +93,53 @@ test: bzip2
+ cmp sample3.tst sample3.ref
+ @cat words3
+
+-install: bzip2 bzip2recover
+- if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
+- if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
+- if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
+- if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
+- if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
+- cp -f bzip2 $(PREFIX)/bin/bzip2
+- cp -f bzip2 $(PREFIX)/bin/bunzip2
+- cp -f bzip2 $(PREFIX)/bin/bzcat
+- cp -f bzip2recover $(PREFIX)/bin/bzip2recover
+- chmod a+x $(PREFIX)/bin/bzip2
+- chmod a+x $(PREFIX)/bin/bunzip2
+- chmod a+x $(PREFIX)/bin/bzcat
+- chmod a+x $(PREFIX)/bin/bzip2recover
+- cp -f bzip2.1 $(PREFIX)/man/man1
+- chmod a+r $(PREFIX)/man/man1/bzip2.1
+- cp -f bzlib.h $(PREFIX)/include
+- chmod a+r $(PREFIX)/include/bzlib.h
+- cp -f libbz2.a $(PREFIX)/lib
+- chmod a+r $(PREFIX)/lib/libbz2.a
+- cp -f bzgrep $(PREFIX)/bin/bzgrep
+- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
+- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
+- chmod a+x $(PREFIX)/bin/bzgrep
+- cp -f bzmore $(PREFIX)/bin/bzmore
+- ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
+- chmod a+x $(PREFIX)/bin/bzmore
+- cp -f bzdiff $(PREFIX)/bin/bzdiff
+- ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
+- chmod a+x $(PREFIX)/bin/bzdiff
+- cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
+- chmod a+r $(PREFIX)/man/man1/bzgrep.1
+- chmod a+r $(PREFIX)/man/man1/bzmore.1
+- chmod a+r $(PREFIX)/man/man1/bzdiff.1
+- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
+- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
+- echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
+- echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
++install: bzip2 bzip2recover libbz2.a
++ if ( test ! -d $(DESTDIR)$(PREFIX)/bin ) ; then mkdir -p $(DESTDIR)$(PREFIX)/bin ; fi
++ if ( test ! -d $(DESTDIR)$(PREFIX)/lib ) ; then mkdir -p $(DESTDIR)$(PREFIX)/lib ; fi
++ if ( test ! -d $(DESTDIR)$(PREFIX)/man ) ; then mkdir -p $(DESTDIR)$(PREFIX)/man ; fi
++ if ( test ! -d $(DESTDIR)$(PREFIX)/man/man1 ) ; then mkdir -p $(DESTDIR)$(PREFIX)/man/man1 ; fi
++ if ( test ! -d $(DESTDIR)$(PREFIX)/include ) ; then mkdir -p $(DESTDIR)$(PREFIX)/include ; fi
++ cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzip2
++ ln $(DESTDIR)$(PREFIX)/bin/bzip2 $(DESTDIR)$(PREFIX)/bin/bunzip2
++ ln $(DESTDIR)$(PREFIX)/bin/bzip2 $(DESTDIR)$(PREFIX)/bin/bzcat
++ cp -f bzip2recover $(DESTDIR)$(PREFIX)/bin/bzip2recover
++ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2
++ chmod a+x $(DESTDIR)$(PREFIX)/bin/bunzip2
++ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzcat
++ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2recover
++ cp -f bzip2.1 $(DESTDIR)$(PREFIX)/man/man1
++ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzip2.1
++ cp -f bzlib.h $(DESTDIR)$(PREFIX)/include
++ chmod a+r $(DESTDIR)$(PREFIX)/include/bzlib.h
++ cp -fa libbz2.a libbz2.so* $(DESTDIR)$(PREFIX)/lib
++ chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.a
++ cp -f bzgrep $(DESTDIR)$(PREFIX)/bin/bzgrep
++ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzegrep
++ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzfgrep
++ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzgrep
++ cp -f bzmore $(DESTDIR)$(PREFIX)/bin/bzmore
++ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzmore $(DESTDIR)$(PREFIX)/bin/bzless
++ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzmore
++ cp -f bzdiff $(DESTDIR)$(PREFIX)/bin/bzdiff
++ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzdiff $(DESTDIR)$(PREFIX)/bin/bzcmp
++ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzdiff
++ cp -f bzgrep.1 bzmore.1 bzdiff.1 $(DESTDIR)$(PREFIX)/man/man1
++ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzgrep.1
++ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzmore.1
++ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzdiff.1
++ echo ".so man1/bzgrep.1" > $(DESTDIR)$(PREFIX)/man/man1/bzegrep.1
++ echo ".so man1/bzgrep.1" > $(DESTDIR)$(PREFIX)/man/man1/bzfgrep.1
++ echo ".so man1/bzmore.1" > $(DESTDIR)$(PREFIX)/man/man1/bzless.1
++ echo ".so man1/bzdiff.1" > $(DESTDIR)$(PREFIX)/man/man1/bzcmp.1
+
+ clean:
+- rm -f *.o libbz2.a bzip2 bzip2recover \
++ rm -f *.o *.sho libbz2.a libbz2.so* bzip2 bzip2recover \
+ sample1.rb2 sample2.rb2 sample3.rb2 \
+ sample1.tst sample2.tst sample3.tst
+
+-blocksort.o: blocksort.c
+- @cat words0
+- $(CC) $(CFLAGS) -c blocksort.c
+-huffman.o: huffman.c
+- $(CC) $(CFLAGS) -c huffman.c
+-crctable.o: crctable.c
+- $(CC) $(CFLAGS) -c crctable.c
+-randtable.o: randtable.c
+- $(CC) $(CFLAGS) -c randtable.c
+-compress.o: compress.c
+- $(CC) $(CFLAGS) -c compress.c
+-decompress.o: decompress.c
+- $(CC) $(CFLAGS) -c decompress.c
+-bzlib.o: bzlib.c
+- $(CC) $(CFLAGS) -c bzlib.c
+-bzip2.o: bzip2.c
+- $(CC) $(CFLAGS) -c bzip2.c
+-bzip2recover.o: bzip2recover.c
+- $(CC) $(CFLAGS) -c bzip2recover.c
+-
+
+ distclean: clean
+- rm -f manual.ps manual.html manual.pdf
++ #rm -f manual.ps manual.html manual.pdf
+
+ DISTNAME=bzip2-1.0.5
+ dist: check manual
+--
+1.7.7
+
diff --git a/patches/bzip2-1.0.5/bzip2-1.0.5_Makefile.diff b/patches/bzip2-1.0.5/bzip2-1.0.5_Makefile.diff
deleted file mode 100644
index 3aa4c79..0000000
--- a/patches/bzip2-1.0.5/bzip2-1.0.5_Makefile.diff
+++ /dev/null
@@ -1,207 +0,0 @@
-Subject: [patch] fixup Makefile
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-
-This patch fixes various problems in the makefile and disables compile
-time test. It was taken from Debinan.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
-# 20091210 rsc: needs probably another look before going mainline
-
- Makefile | 134 ++++++++++++++++++++++++++++++++-------------------------------
- 1 file changed, 69 insertions(+), 65 deletions(-)
-
-Index: b/Makefile
-===================================================================
---- a/Makefile
-+++ b/Makefile
-@@ -12,6 +12,8 @@
- # in the file LICENSE.
- # ------------------------------------------------------------------
-
-+somajor=1.0
-+sominor=$(somajor).4
- SHELL=/bin/sh
-
- # To assist in cross-compiling
-@@ -21,7 +23,7 @@ RANLIB=ranlib
- LDFLAGS=
-
- BIGFILES=-D_FILE_OFFSET_BITS=64
--CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
-+CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) $(DEBCFLAGS)
-
- # Where you want it installed when you do 'make install'
- PREFIX=/usr/local
-@@ -35,9 +37,9 @@ OBJS= blocksort.o \
- decompress.o \
- bzlib.o
-
--all: libbz2.a bzip2 bzip2recover test
-+all: libbz2.a bzip2 bzip2recover # test
-
--bzip2: libbz2.a bzip2.o
-+bzip2: libbz2.so bzip2.o
- $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
-
- bzip2recover: bzip2recover.o
-@@ -46,20 +48,42 @@ bzip2recover: bzip2recover.o
- libbz2.a: $(OBJS)
- rm -f libbz2.a
- $(AR) cq libbz2.a $(OBJS)
-- @if ( test -f $(RANLIB) -o -f /usr/bin/ranlib -o \
-- -f /bin/ranlib -o -f /usr/ccs/bin/ranlib ) ; then \
-+ @if ( test -f $(RANLIB) || test -f /usr/bin/ranlib || \
-+ test -f /bin/ranlib || test -f /usr/ccs/bin/ranlib ) ; then \
- echo $(RANLIB) libbz2.a ; \
- $(RANLIB) libbz2.a ; \
- fi
-
-+libbz2.so: libbz2.so.$(somajor)
-+ ln -sf $^ $@
-+
-+libbz2.so.$(somajor): libbz2.so.$(sominor)
-+ ln -sf $^ $@
-+
-+libbz2.so.$(sominor): $(OBJS:%.o=%.sho)
-+ $(CC) -o libbz2.so.$(sominor) -shared \
-+ -Wl,-soname,libbz2.so.$(somajor) $^ -lc
-+
-+%.sho: %.c
-+ $(CC) $(CFLAGS) -D_REENTRANT -fPIC -o $@ -c $<
-+
-+%.o: %.c
-+ $(CC) $(CFLAGS) -D_REENTRANT -o $@ -c $<
-+
- check: test
- test: bzip2
- @cat words1
-+ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
- ./bzip2 -1 < sample1.ref > sample1.rb2
-+ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
- ./bzip2 -2 < sample2.ref > sample2.rb2
-+ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
- ./bzip2 -3 < sample3.ref > sample3.rb2
-+ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
- ./bzip2 -d < sample1.bz2 > sample1.tst
-+ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
- ./bzip2 -d < sample2.bz2 > sample2.tst
-+ LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
- ./bzip2 -ds < sample3.bz2 > sample3.tst
- cmp sample1.bz2 sample1.rb2
- cmp sample2.bz2 sample2.rb2
-@@ -69,73 +93,53 @@ test: bzip2
- cmp sample3.tst sample3.ref
- @cat words3
-
--install: bzip2 bzip2recover
-- if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
-- if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
-- if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
-- if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
-- if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
-- cp -f bzip2 $(PREFIX)/bin/bzip2
-- cp -f bzip2 $(PREFIX)/bin/bunzip2
-- cp -f bzip2 $(PREFIX)/bin/bzcat
-- cp -f bzip2recover $(PREFIX)/bin/bzip2recover
-- chmod a+x $(PREFIX)/bin/bzip2
-- chmod a+x $(PREFIX)/bin/bunzip2
-- chmod a+x $(PREFIX)/bin/bzcat
-- chmod a+x $(PREFIX)/bin/bzip2recover
-- cp -f bzip2.1 $(PREFIX)/man/man1
-- chmod a+r $(PREFIX)/man/man1/bzip2.1
-- cp -f bzlib.h $(PREFIX)/include
-- chmod a+r $(PREFIX)/include/bzlib.h
-- cp -f libbz2.a $(PREFIX)/lib
-- chmod a+r $(PREFIX)/lib/libbz2.a
-- cp -f bzgrep $(PREFIX)/bin/bzgrep
-- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
-- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
-- chmod a+x $(PREFIX)/bin/bzgrep
-- cp -f bzmore $(PREFIX)/bin/bzmore
-- ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
-- chmod a+x $(PREFIX)/bin/bzmore
-- cp -f bzdiff $(PREFIX)/bin/bzdiff
-- ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
-- chmod a+x $(PREFIX)/bin/bzdiff
-- cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
-- chmod a+r $(PREFIX)/man/man1/bzgrep.1
-- chmod a+r $(PREFIX)/man/man1/bzmore.1
-- chmod a+r $(PREFIX)/man/man1/bzdiff.1
-- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
-- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
-- echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
-- echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
-+install: bzip2 bzip2recover libbz2.a
-+ if ( test ! -d $(DESTDIR)$(PREFIX)/bin ) ; then mkdir -p $(DESTDIR)$(PREFIX)/bin ; fi
-+ if ( test ! -d $(DESTDIR)$(PREFIX)/lib ) ; then mkdir -p $(DESTDIR)$(PREFIX)/lib ; fi
-+ if ( test ! -d $(DESTDIR)$(PREFIX)/man ) ; then mkdir -p $(DESTDIR)$(PREFIX)/man ; fi
-+ if ( test ! -d $(DESTDIR)$(PREFIX)/man/man1 ) ; then mkdir -p $(DESTDIR)$(PREFIX)/man/man1 ; fi
-+ if ( test ! -d $(DESTDIR)$(PREFIX)/include ) ; then mkdir -p $(DESTDIR)$(PREFIX)/include ; fi
-+ cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzip2
-+ ln $(DESTDIR)$(PREFIX)/bin/bzip2 $(DESTDIR)$(PREFIX)/bin/bunzip2
-+ ln $(DESTDIR)$(PREFIX)/bin/bzip2 $(DESTDIR)$(PREFIX)/bin/bzcat
-+ cp -f bzip2recover $(DESTDIR)$(PREFIX)/bin/bzip2recover
-+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2
-+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bunzip2
-+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzcat
-+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2recover
-+ cp -f bzip2.1 $(DESTDIR)$(PREFIX)/man/man1
-+ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzip2.1
-+ cp -f bzlib.h $(DESTDIR)$(PREFIX)/include
-+ chmod a+r $(DESTDIR)$(PREFIX)/include/bzlib.h
-+ cp -fa libbz2.a libbz2.so* $(DESTDIR)$(PREFIX)/lib
-+ chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.a
-+ cp -f bzgrep $(DESTDIR)$(PREFIX)/bin/bzgrep
-+ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzegrep
-+ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzfgrep
-+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzgrep
-+ cp -f bzmore $(DESTDIR)$(PREFIX)/bin/bzmore
-+ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzmore $(DESTDIR)$(PREFIX)/bin/bzless
-+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzmore
-+ cp -f bzdiff $(DESTDIR)$(PREFIX)/bin/bzdiff
-+ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzdiff $(DESTDIR)$(PREFIX)/bin/bzcmp
-+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzdiff
-+ cp -f bzgrep.1 bzmore.1 bzdiff.1 $(DESTDIR)$(PREFIX)/man/man1
-+ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzgrep.1
-+ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzmore.1
-+ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzdiff.1
-+ echo ".so man1/bzgrep.1" > $(DESTDIR)$(PREFIX)/man/man1/bzegrep.1
-+ echo ".so man1/bzgrep.1" > $(DESTDIR)$(PREFIX)/man/man1/bzfgrep.1
-+ echo ".so man1/bzmore.1" > $(DESTDIR)$(PREFIX)/man/man1/bzless.1
-+ echo ".so man1/bzdiff.1" > $(DESTDIR)$(PREFIX)/man/man1/bzcmp.1
-
- clean:
-- rm -f *.o libbz2.a bzip2 bzip2recover \
-+ rm -f *.o *.sho libbz2.a libbz2.so* bzip2 bzip2recover \
- sample1.rb2 sample2.rb2 sample3.rb2 \
- sample1.tst sample2.tst sample3.tst
-
--blocksort.o: blocksort.c
-- @cat words0
-- $(CC) $(CFLAGS) -c blocksort.c
--huffman.o: huffman.c
-- $(CC) $(CFLAGS) -c huffman.c
--crctable.o: crctable.c
-- $(CC) $(CFLAGS) -c crctable.c
--randtable.o: randtable.c
-- $(CC) $(CFLAGS) -c randtable.c
--compress.o: compress.c
-- $(CC) $(CFLAGS) -c compress.c
--decompress.o: decompress.c
-- $(CC) $(CFLAGS) -c decompress.c
--bzlib.o: bzlib.c
-- $(CC) $(CFLAGS) -c bzlib.c
--bzip2.o: bzip2.c
-- $(CC) $(CFLAGS) -c bzip2.c
--bzip2recover.o: bzip2recover.c
-- $(CC) $(CFLAGS) -c bzip2recover.c
--
-
- distclean: clean
-- rm -f manual.ps manual.html manual.pdf
-+ #rm -f manual.ps manual.html manual.pdf
-
- DISTNAME=bzip2-1.0.5
- dist: check manual
diff --git a/patches/bzip2-1.0.5/series b/patches/bzip2-1.0.5/series
deleted file mode 100644
index 5a7c5de..0000000
--- a/patches/bzip2-1.0.5/series
+++ /dev/null
@@ -1 +0,0 @@
-bzip2-1.0.5_Makefile.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 11/28] cbmbasic: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (8 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 10/28] bzip2: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 12/28] cpufrequtils: " Robert Schwebel
` (16 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
...and-pseudo-timer-will-give-RND-functional.patch | 56 ++++++++++++++++++++
patches/cbmbasic/add_iobase.diff | 48 -----------------
patches/cbmbasic/series | 1 -
3 files changed, 56 insertions(+), 49 deletions(-)
create mode 100644 patches/cbmbasic/0001-Add-IOBASE-and-pseudo-timer-will-give-RND-functional.patch
delete mode 100644 patches/cbmbasic/add_iobase.diff
delete mode 100644 patches/cbmbasic/series
diff --git a/patches/cbmbasic/0001-Add-IOBASE-and-pseudo-timer-will-give-RND-functional.patch b/patches/cbmbasic/0001-Add-IOBASE-and-pseudo-timer-will-give-RND-functional.patch
new file mode 100644
index 0000000..21ebb33
--- /dev/null
+++ b/patches/cbmbasic/0001-Add-IOBASE-and-pseudo-timer-will-give-RND-functional.patch
@@ -0,0 +1,56 @@
+From f7cf261c349c0f511392ec061011ce0a84fbec0b Mon Sep 17 00:00:00 2001
+From: Wolfram Sang <ninja@the-dreams.de>
+Date: Sat, 29 Oct 2011 19:01:11 +0200
+Subject: [PATCH] Add IOBASE and pseudo-timer (will give RND-functionality)
+
+Signed-off-by: Wolfram Sang <ninja@the-dreams.de>
+
+# ---
+# 20091210 rsc: check if there is another upstream version
+# 20081127 wsa: already sent mainline and accepted.
+---
+ runtime.c | 14 ++++++++++++--
+ 1 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/runtime.c b/runtime.c
+index 454000e..2c3c54b 100644
+--- a/runtime.c
++++ b/runtime.c
+@@ -29,6 +29,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <time.h>
+
+ unsigned char RAM[65536];
+
+@@ -155,6 +156,7 @@ init_os(int argc, char **argv) {
+ interactive = 1;
+ f = NULL;
+ }
++ srand(time(NULL));
+ }
+
+ static void
+@@ -565,8 +567,16 @@ PLOT() {
+ /* IOBASE */
+ static void
+ IOBASE() {
+- printf("UNIMPL: IOBASE\n");
+- exit(1);
++ /*
++ * IOBASE is just used inside RND to get a timer value.
++ * So, let's fake this here, too.
++ */
++ int pseudo_timer = rand();
++ RAM[0xDC04] = pseudo_timer&0xff;
++ RAM[0xDC05] = pseudo_timer>>8;
++
++ X = 0x00;
++ Y = 0xDC;
+ }
+
+ int
+--
+1.7.7
+
diff --git a/patches/cbmbasic/add_iobase.diff b/patches/cbmbasic/add_iobase.diff
deleted file mode 100644
index 55628b6..0000000
--- a/patches/cbmbasic/add_iobase.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-Subject: Add IOBASE and pseudo-timer (will give RND-functionality)
-From: Wolfram Sang <ninja@the-dreams.de>
-
-Signed-off-by: Wolfram Sang <ninja@the-dreams.de>
-
-# ---
-# 20091210 rsc: check if there is another upstream version
-# 20081127 wsa: already sent mainline and accepted.
-
-Index: basic/runtime.c
-===================================================================
---- basic.orig/runtime.c 2008-11-17 05:16:31.000000000 +0100
-+++ basic/runtime.c 2008-11-17 05:43:31.000000000 +0100
-@@ -29,6 +29,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include <time.h>
-
- unsigned char RAM[65536];
-
-@@ -155,6 +156,7 @@
- interactive = 1;
- f = NULL;
- }
-+ srand(time(NULL));
- }
-
- static void
-@@ -565,8 +567,16 @@
- /* IOBASE */
- static void
- IOBASE() {
-- printf("UNIMPL: IOBASE\n");
-- exit(1);
-+ /*
-+ * IOBASE is just used inside RND to get a timer value.
-+ * So, let's fake this here, too.
-+ */
-+ int pseudo_timer = rand();
-+ RAM[0xDC04] = pseudo_timer&0xff;
-+ RAM[0xDC05] = pseudo_timer>>8;
-+
-+ X = 0x00;
-+ Y = 0xDC;
- }
-
- int
diff --git a/patches/cbmbasic/series b/patches/cbmbasic/series
deleted file mode 100644
index a474bc9..0000000
--- a/patches/cbmbasic/series
+++ /dev/null
@@ -1 +0,0 @@
-add_iobase.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 12/28] cpufrequtils: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (9 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 11/28] cbmbasic: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 13/28] cvs: " Robert Schwebel
` (15 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
.../0001-build-system-fix.diff.patch | 45 ++++++++++++++++++++
patches/cpufrequtils-007/build-system-fix.diff | 38 ----------------
patches/cpufrequtils-007/series | 1 -
3 files changed, 45 insertions(+), 39 deletions(-)
create mode 100644 patches/cpufrequtils-007/0001-build-system-fix.diff.patch
delete mode 100644 patches/cpufrequtils-007/build-system-fix.diff
delete mode 100644 patches/cpufrequtils-007/series
diff --git a/patches/cpufrequtils-007/0001-build-system-fix.diff.patch b/patches/cpufrequtils-007/0001-build-system-fix.diff.patch
new file mode 100644
index 0000000..03f48ba
--- /dev/null
+++ b/patches/cpufrequtils-007/0001-build-system-fix.diff.patch
@@ -0,0 +1,45 @@
+From c2d6a2148c0da01244a2a217ecff02d43fcc29fa Mon Sep 17 00:00:00 2001
+From: unknown author <unknown.author@example.com>
+Date: Sat, 29 Oct 2011 19:03:54 +0200
+Subject: [PATCH] build-system-fix.diff
+
+Fix various issues while cross compiling
+---
+ Makefile | 17 ++++++++++-------
+ 1 files changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f44f817..1b27ecf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -80,17 +80,20 @@ INSTALL = /usr/bin/install -c
+ INSTALL_PROGRAM = ${INSTALL}
+ INSTALL_DATA = ${INSTALL} -m 644
+ INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+-LIBTOOL = /usr/bin/libtool
++# --tag required to make libtool happy about the source type
++LIBTOOL = libtool --tag CC
+
+ # If you are running a cross compiler, you may want to set this
+ # to something more interesting, like "arm-linux-". If you want
+ # to compile vs uClibc, that can be done here as well.
+-CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
+-CC = $(CROSS)gcc
+-LD = $(CROSS)gcc
+-AR = $(CROSS)ar
+-STRIP = $(CROSS)strip
+-RANLIB = $(CROSS)ranlib
++
++# ptxdist will overwrite them
++#CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
++#CC = $(CROSS)gcc
++#LD = $(CROSS)gcc
++#AR = $(CROSS)ar
++#STRIP = $(CROSS)strip
++#RANLIB = $(CROSS)ranlib
+ HOSTCC = gcc
+
+
+--
+1.7.7
+
diff --git a/patches/cpufrequtils-007/build-system-fix.diff b/patches/cpufrequtils-007/build-system-fix.diff
deleted file mode 100644
index 7827ab4..0000000
--- a/patches/cpufrequtils-007/build-system-fix.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-Fix various issues while cross compiling
-
----
- Makefile | 17 ++++++++++-------
- 1 file changed, 10 insertions(+), 7 deletions(-)
-
-Index: cpufrequtils-007/Makefile
-===================================================================
---- cpufrequtils-007.orig/Makefile
-+++ cpufrequtils-007/Makefile
-@@ -80,17 +80,20 @@ INSTALL = /usr/bin/install -c
- INSTALL_PROGRAM = ${INSTALL}
- INSTALL_DATA = ${INSTALL} -m 644
- INSTALL_SCRIPT = ${INSTALL_PROGRAM}
--LIBTOOL = /usr/bin/libtool
-+# --tag required to make libtool happy about the source type
-+LIBTOOL = libtool --tag CC
-
- # If you are running a cross compiler, you may want to set this
- # to something more interesting, like "arm-linux-". If you want
- # to compile vs uClibc, that can be done here as well.
--CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
--CC = $(CROSS)gcc
--LD = $(CROSS)gcc
--AR = $(CROSS)ar
--STRIP = $(CROSS)strip
--RANLIB = $(CROSS)ranlib
-+
-+# ptxdist will overwrite them
-+#CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
-+#CC = $(CROSS)gcc
-+#LD = $(CROSS)gcc
-+#AR = $(CROSS)ar
-+#STRIP = $(CROSS)strip
-+#RANLIB = $(CROSS)ranlib
- HOSTCC = gcc
-
-
diff --git a/patches/cpufrequtils-007/series b/patches/cpufrequtils-007/series
deleted file mode 100644
index 163fc15..0000000
--- a/patches/cpufrequtils-007/series
+++ /dev/null
@@ -1 +0,0 @@
-build-system-fix.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 13/28] cvs: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (10 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 12/28] cpufrequtils: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 14/28] daemonize: " Robert Schwebel
` (14 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
.../0001-link-against-system-zlib.patch | 130 ++++++++++++++++++++
.../cvs-1.11.22/cvs-1.11.22-use-system-zlib.patch | 118 ------------------
patches/cvs-1.11.22/series | 1 -
3 files changed, 130 insertions(+), 119 deletions(-)
create mode 100644 patches/cvs-1.11.22/0001-link-against-system-zlib.patch
delete mode 100644 patches/cvs-1.11.22/cvs-1.11.22-use-system-zlib.patch
delete mode 100644 patches/cvs-1.11.22/series
diff --git a/patches/cvs-1.11.22/0001-link-against-system-zlib.patch b/patches/cvs-1.11.22/0001-link-against-system-zlib.patch
new file mode 100644
index 0000000..1b9846e
--- /dev/null
+++ b/patches/cvs-1.11.22/0001-link-against-system-zlib.patch
@@ -0,0 +1,130 @@
+From 7cb47b46f7415d10d64a40614f9d6493d05eb296 Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sat, 29 Oct 2011 19:05:46 +0200
+Subject: [PATCH] link against system zlib
+
+Instead of building our own internal zlib, link against the variant
+provided by the system.
+
+This patch was taken from linux-from-scratch:
+
+ Submitted By: Matthew Burgess <matthew@linuxfromscratch.org>
+ Date: 2004-11-12
+ Initial Package Version: 1.11.2
+ Upstream Status: Not submitted
+ Origin: BLFS Dev Post
+ Description: Links against system zlib instead of the
+ internal zlib.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ Makefile.in | 12 +++++-------
+ src/Makefile.in | 6 +++---
+ src/zlib.c | 2 +-
+ 3 files changed, 9 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index b577801..cb3cea1 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -53,7 +53,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(srcdir)/cvs.spec.in $(top_srcdir)/configure \
+ $(top_srcdir)/emx/Makefile.in $(top_srcdir)/os2/Makefile.in \
+- $(top_srcdir)/zlib/Makefile.in AUTHORS COPYING COPYING.LIB \
++ AUTHORS COPYING COPYING.LIB \
+ ChangeLog INSTALL NEWS TODO compile depcomp install-sh \
+ mdate-sh missing mkinstalldirs ylwrap
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -65,7 +65,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno configure.status.lineno
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
+-CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile zlib/Makefile
++CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile
+ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -184,7 +184,7 @@ with_default_rsh = @with_default_rsh@
+
+ # Unix source subdirs, where we'll want to run lint and etags:
+ # This is a legacy variable from b4 Automake
+-USOURCE_SUBDIRS = lib zlib diff src
++USOURCE_SUBDIRS = lib diff src
+ # All other subdirs:
+ SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
+ windows-NT os2 emx vms
+@@ -256,7 +256,7 @@ config.h: stamp-h1
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
+-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_srcdir) && $(AUTOHEADER)
+ rm -f stamp-h1
+ touch $@
+@@ -269,8 +269,6 @@ emx/Makefile: $(top_builddir)/config.status $(top_srcdir)/emx/Makefile.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+ os2/Makefile: $(top_builddir)/config.status $(top_srcdir)/os2/Makefile.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+-zlib/Makefile: $(top_builddir)/config.status $(top_srcdir)/zlib/Makefile.in
+- cd $(top_builddir) && $(SHELL) ./config.status $@
+ uninstall-info-am:
+
+ # This directory's subdirectories are mostly independent; you can cd
+@@ -408,7 +406,7 @@ distclean-tags:
+ distdir: $(DISTFILES)
+ $(am__remove_distdir)
+ mkdir $(distdir)
+- $(mkdir_p) $(distdir)/. $(distdir)/contrib $(distdir)/doc $(distdir)/emx $(distdir)/lib $(distdir)/os2 $(distdir)/src $(distdir)/windows-NT $(distdir)/zlib
++ $(mkdir_p) $(distdir)/. $(distdir)/contrib $(distdir)/doc $(distdir)/emx $(distdir)/lib $(distdir)/os2 $(distdir)/src $(distdir)/windows-NT
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 3765523..98bcd79 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -86,7 +86,7 @@ am_cvs_OBJECTS = add.$(OBJEXT) admin.$(OBJEXT) annotate.$(OBJEXT) \
+ version.$(OBJEXT) vers_ts.$(OBJEXT) watch.$(OBJEXT) \
+ wrapper.$(OBJEXT) zlib.$(OBJEXT)
+ cvs_OBJECTS = $(am_cvs_OBJECTS)
+-cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a ../zlib/libz.a
++cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(bin_SCRIPTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -200,7 +200,7 @@ with_default_rsh = @with_default_rsh@
+ # some namespace hackery going on that maybe shouldn't be. Long term fix is to
+ # try and remove naming ocnflicts and fix Automake to allow particular includes
+ # to be attached only to particular object files. Short term fix is either or.
+-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
++INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
+ bin_SCRIPTS = cvsbug
+
+ # The cvs executable
+@@ -279,7 +279,7 @@ cvs_SOURCES = \
+ cvs_LDADD = \
+ ../diff/libdiff.a \
+ ../lib/libcvs.a \
+- ../zlib/libz.a
++ -lz
+
+
+ # extra clean targets
+diff --git a/src/zlib.c b/src/zlib.c
+index 46ed0e6..4024a6b 100644
+--- a/src/zlib.c
++++ b/src/zlib.c
+@@ -22,7 +22,7 @@
+
+ #if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT)
+
+-#include "zlib.h"
++#include <zlib.h>
+
+ /* OS/2 doesn't have EIO. FIXME: this whole notion of turning
+ a different error into EIO strikes me as pretty dubious. */
+--
+1.7.7
+
diff --git a/patches/cvs-1.11.22/cvs-1.11.22-use-system-zlib.patch b/patches/cvs-1.11.22/cvs-1.11.22-use-system-zlib.patch
deleted file mode 100644
index 2801320..0000000
--- a/patches/cvs-1.11.22/cvs-1.11.22-use-system-zlib.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: [cvs] link against system zlib
-
-Instead of building our own internal zlib, link against the variant
-provided by the system.
-
-This patch was taken from linux-from-scratch:
-
- Submitted By: Matthew Burgess <matthew@linuxfromscratch.org>
- Date: 2004-11-12
- Initial Package Version: 1.11.2
- Upstream Status: Not submitted
- Origin: BLFS Dev Post
- Description: Links against system zlib instead of the
- internal zlib.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
-
-diff -Naur cvs-1.11.18.orig/src/Makefile.in cvs-1.11.18/src/Makefile.in
---- cvs-1.11.18.orig/src/Makefile.in 2004-11-11 18:17:20.000000000 +0000
-+++ cvs-1.11.18/src/Makefile.in 2004-11-12 19:58:14.962293296 +0000
-@@ -86,7 +86,7 @@
- version.$(OBJEXT) vers_ts.$(OBJEXT) watch.$(OBJEXT) \
- wrapper.$(OBJEXT) zlib.$(OBJEXT)
- cvs_OBJECTS = $(am_cvs_OBJECTS)
--cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a ../zlib/libz.a
-+cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a
- binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
- SCRIPTS = $(bin_SCRIPTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-@@ -199,7 +199,7 @@
- # some namespace hackery going on that maybe shouldn't be. Long term fix is to
- # try and remove naming ocnflicts and fix Automake to allow particular includes
- # to be attached only to particular object files. Short term fix is either or.
--INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
-+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
- bin_SCRIPTS = cvsbug
-
- # The cvs executable
-@@ -278,7 +278,7 @@
- cvs_LDADD = \
- ../diff/libdiff.a \
- ../lib/libcvs.a \
-- ../zlib/libz.a
-+ -lz
-
-
- # extra clean targets
-diff -Naur cvs-1.11.18.orig/src/zlib.c cvs-1.11.18/src/zlib.c
---- cvs-1.11.18.orig/src/zlib.c 2004-03-19 19:18:57.000000000 +0000
-+++ cvs-1.11.18/src/zlib.c 2004-11-12 19:58:55.531125896 +0000
-@@ -22,7 +22,7 @@
-
- #if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT)
-
--#include "zlib.h"
-+#include <zlib.h>
-
- /* OS/2 doesn't have EIO. FIXME: this whole notion of turning
- a different error into EIO strikes me as pretty dubious. */
---- cvs-1.11.22/Makefile.in.orig
-+++ cvs-1.11.22/Makefile.in
-@@ -53,7 +53,7 @@
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(srcdir)/cvs.spec.in $(top_srcdir)/configure \
- $(top_srcdir)/emx/Makefile.in $(top_srcdir)/os2/Makefile.in \
-- $(top_srcdir)/zlib/Makefile.in AUTHORS COPYING COPYING.LIB \
-+ AUTHORS COPYING COPYING.LIB \
- ChangeLog INSTALL NEWS TODO compile depcomp install-sh \
- mdate-sh missing mkinstalldirs ylwrap
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -65,7 +65,7 @@
- configure.lineno configure.status.lineno
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile zlib/Makefile
-+CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile
- SOURCES =
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -184,7 +184,7 @@
-
- # Unix source subdirs, where we'll want to run lint and etags:
- # This is a legacy variable from b4 Automake
--USOURCE_SUBDIRS = lib zlib diff src
-+USOURCE_SUBDIRS = lib diff src
- # All other subdirs:
- SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
- windows-NT os2 emx vms
-@@ -256,7 +256,7 @@
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
--$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h1
- touch $@
-@@ -269,8 +269,6 @@
- cd $(top_builddir) && $(SHELL) ./config.status $@
- os2/Makefile: $(top_builddir)/config.status $(top_srcdir)/os2/Makefile.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
--zlib/Makefile: $(top_builddir)/config.status $(top_srcdir)/zlib/Makefile.in
-- cd $(top_builddir) && $(SHELL) ./config.status $@
- uninstall-info-am:
-
- # This directory's subdirectories are mostly independent; you can cd
-@@ -408,7 +406,7 @@
- distdir: $(DISTFILES)
- $(am__remove_distdir)
- mkdir $(distdir)
-- $(mkdir_p) $(distdir)/. $(distdir)/contrib $(distdir)/doc $(distdir)/emx $(distdir)/lib $(distdir)/os2 $(distdir)/src $(distdir)/windows-NT $(distdir)/zlib
-+ $(mkdir_p) $(distdir)/. $(distdir)/contrib $(distdir)/doc $(distdir)/emx $(distdir)/lib $(distdir)/os2 $(distdir)/src $(distdir)/windows-NT
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
diff --git a/patches/cvs-1.11.22/series b/patches/cvs-1.11.22/series
deleted file mode 100644
index 675a2b6..0000000
--- a/patches/cvs-1.11.22/series
+++ /dev/null
@@ -1 +0,0 @@
-cvs-1.11.22-use-system-zlib.patch
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 14/28] daemonize: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (11 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 13/28] cvs: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 15/28] dibbler: " Robert Schwebel
` (13 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
.../daemonize-1.4/0001-install-to-DESTDIR.patch | 26 ++++++++++++++++++++
patches/daemonize-1.4/fix-destdir-install.diff | 22 ----------------
patches/daemonize-1.4/series | 1 -
3 files changed, 26 insertions(+), 23 deletions(-)
create mode 100644 patches/daemonize-1.4/0001-install-to-DESTDIR.patch
delete mode 100644 patches/daemonize-1.4/fix-destdir-install.diff
delete mode 100644 patches/daemonize-1.4/series
diff --git a/patches/daemonize-1.4/0001-install-to-DESTDIR.patch b/patches/daemonize-1.4/0001-install-to-DESTDIR.patch
new file mode 100644
index 0000000..85679b3
--- /dev/null
+++ b/patches/daemonize-1.4/0001-install-to-DESTDIR.patch
@@ -0,0 +1,26 @@
+From 8e91c4db00e0bb71d508dd63842f450feddaeb60 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 29 Oct 2011 19:06:44 +0200
+Subject: [PATCH] install to DESTDIR
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ Makefile.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 6fcb8f7..332c180 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -7,7 +7,7 @@ srcdir = @srcdir@
+ VPATH = @srcdir@
+ INSTALL_PREFIX = @prefix@
+ INSTALL = @INSTALL@
+-INSTALL_SBIN = $(INSTALL_PREFIX)/sbin
++INSTALL_SBIN = $(DESTDIR)$(INSTALL_PREFIX)/sbin
+ MISSING_SOURCES = @LOCAL_MISSING_SOURCES@
+ MISSING_OBJECTS = $(MISSING_SOURCES:.c=.o)
+ CC = @CC@
+--
+1.7.7
+
diff --git a/patches/daemonize-1.4/fix-destdir-install.diff b/patches/daemonize-1.4/fix-destdir-install.diff
deleted file mode 100644
index 6f6d61b..0000000
--- a/patches/daemonize-1.4/fix-destdir-install.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: install to DESTDIR
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: b/Makefile.in
-===================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -7,7 +7,7 @@ srcdir = @srcdir@
- VPATH = @srcdir@
- INSTALL_PREFIX = @prefix@
- INSTALL = @INSTALL@
--INSTALL_SBIN = $(INSTALL_PREFIX)/sbin
-+INSTALL_SBIN = $(DESTDIR)$(INSTALL_PREFIX)/sbin
- MISSING_SOURCES = @LOCAL_MISSING_SOURCES@
- MISSING_OBJECTS = $(MISSING_SOURCES:.c=.o)
- CC = @CC@
diff --git a/patches/daemonize-1.4/series b/patches/daemonize-1.4/series
deleted file mode 100644
index 2be6392..0000000
--- a/patches/daemonize-1.4/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-destdir-install.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 15/28] dibbler: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (12 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 14/28] daemonize: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 16/28] e2fsprogs: " Robert Schwebel
` (12 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
patches/dibbler-0.7.3/0001-merge-dns-search.patch | 44 ++++++++++++++++++++
patches/dibbler-0.7.3/0002-fix-compile.patch | 39 +++++++++++++++++
.../dibbler-0.7.3/0003-fix-incremental-build.patch | 32 ++++++++++++++
patches/dibbler-0.7.3/fix-compile.patch | 31 --------------
patches/dibbler-0.7.3/fix-incremental-build.patch | 24 -----------
patches/dibbler-0.7.3/merge-dns-search.patch | 36 ----------------
patches/dibbler-0.7.3/series | 3 -
7 files changed, 115 insertions(+), 94 deletions(-)
create mode 100644 patches/dibbler-0.7.3/0001-merge-dns-search.patch
create mode 100644 patches/dibbler-0.7.3/0002-fix-compile.patch
create mode 100644 patches/dibbler-0.7.3/0003-fix-incremental-build.patch
delete mode 100644 patches/dibbler-0.7.3/fix-compile.patch
delete mode 100644 patches/dibbler-0.7.3/fix-incremental-build.patch
delete mode 100644 patches/dibbler-0.7.3/merge-dns-search.patch
delete mode 100644 patches/dibbler-0.7.3/series
diff --git a/patches/dibbler-0.7.3/0001-merge-dns-search.patch b/patches/dibbler-0.7.3/0001-merge-dns-search.patch
new file mode 100644
index 0000000..34c8cf5
--- /dev/null
+++ b/patches/dibbler-0.7.3/0001-merge-dns-search.patch
@@ -0,0 +1,44 @@
+From 43cbc6a6eecfc9bd2d8412e1ebb36c1bc471d076 Mon Sep 17 00:00:00 2001
+From: unknown author <unknown.author@example.com>
+Date: Sat, 29 Oct 2011 19:10:22 +0200
+Subject: [PATCH 1/3] merge-dns-search
+
+Merge DNS search tables between IPv4 and IPv6
+
+Without this patch the IPv4 search tables will be overwritten
+once an IPv6 domain is added. With this patch both tables
+will be merged.
+
+Signed-off-by: Bart vdr. Meulen <bartvdrmeulen@gmail.com>
+Signed-off-by: Remy Bohmer <linux@bohmer.net>
+---
+ Port-linux/lowlevel-options-linux.c | 13 ++++++++-----
+ 1 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/Port-linux/lowlevel-options-linux.c b/Port-linux/lowlevel-options-linux.c
+index d5be379..929b24b 100644
+--- a/Port-linux/lowlevel-options-linux.c
++++ b/Port-linux/lowlevel-options-linux.c
+@@ -199,11 +199,14 @@ int domain_add(const char* ifname, int ifaceid, const char* domain) {
+ return LOWLEVEL_ERROR_FILE;
+ while (fgets(buf,511,f)) {
+ if ( (!found) && (strstr(buf, "search")) ) {
+- if (strlen(buf))
+- buf[strlen(buf)-1]=0;
+- fprintf(f2, "%s %s\n", buf, domain);
+- found = 1;
+- continue;
++ if (!strstr(buf,domain)) {
++ if (strlen(buf))
++ buf[strlen(buf)-1]=0;
++ fprintf(f2, "%s %s\n", buf, domain);
++ found = 1;
++ continue;
++ }
++
+ }
+ fprintf(f2,"%s",buf);
+ }
+--
+1.7.7
+
diff --git a/patches/dibbler-0.7.3/0002-fix-compile.patch b/patches/dibbler-0.7.3/0002-fix-compile.patch
new file mode 100644
index 0000000..3af7ddf
--- /dev/null
+++ b/patches/dibbler-0.7.3/0002-fix-compile.patch
@@ -0,0 +1,39 @@
+From 7c97b5e9ea7aa16a5a6921a40e2b7a34ce2be93f Mon Sep 17 00:00:00 2001
+From: unknown author <unknown.author@example.com>
+Date: Sat, 29 Oct 2011 19:10:22 +0200
+Subject: [PATCH 2/3] fix-compile
+
+Fix compilation of dibbler package
+
+A header file is included that is not needed, and even breaks
+compilation on recent kernels. Remove it.
+
+Signed-off-by: Remy Bohmer <linux@bohmer.net>
+---
+ Port-linux/utils.c | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/Port-linux/utils.c b/Port-linux/utils.c
+index 4bdda71..14a27f5 100644
+--- a/Port-linux/utils.c
++++ b/Port-linux/utils.c
+@@ -14,6 +14,7 @@
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ */
+
++#define GNU_SOURCE
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -26,7 +27,7 @@
+ #include <arpa/inet.h>
+ #include <resolv.h>
+ #include <asm/types.h>
+-#include <linux/pkt_sched.h>
++/*#include <linux/pkt_sched.h>*/
+ #include <time.h>
+ #include <sys/time.h>
+
+--
+1.7.7
+
diff --git a/patches/dibbler-0.7.3/0003-fix-incremental-build.patch b/patches/dibbler-0.7.3/0003-fix-incremental-build.patch
new file mode 100644
index 0000000..f40595f
--- /dev/null
+++ b/patches/dibbler-0.7.3/0003-fix-incremental-build.patch
@@ -0,0 +1,32 @@
+From 759e0b6853ee53744b308f3651ea02990e98bce0 Mon Sep 17 00:00:00 2001
+From: unknown author <unknown.author@example.com>
+Date: Sat, 29 Oct 2011 19:10:22 +0200
+Subject: [PATCH 3/3] fix-incremental-build
+
+Fix incremental build of dibbler package
+
+The make install fails if the changelog.gz already exists.
+So, the repair incremental builds make sure the changelog.gz
+file does not exist before generating a new one.
+
+Signed-off-by: Remy Bohmer <linux@bohmer.net>
+---
+ Makefile | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b8895c1..48707a5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -428,7 +428,7 @@ install:
+ $(INSTALL) -m 644 doc/dibbler-devel.pdf $(INST_DOCDIR)/dibbler/dibbler-devel.pdf
+ @echo "[INSTALL] CHANGELOG"
+ $(INSTALL) -m 644 CHANGELOG $(INST_DOCDIR)/dibbler/changelog
+- gzip -9 $(INST_DOCDIR)/dibbler/changelog
++ gzip -f -9 $(INST_DOCDIR)/dibbler/changelog
+
+ DIR=`basename $(PWD)`
+
+--
+1.7.7
+
diff --git a/patches/dibbler-0.7.3/fix-compile.patch b/patches/dibbler-0.7.3/fix-compile.patch
deleted file mode 100644
index 66a4cf5..0000000
--- a/patches/dibbler-0.7.3/fix-compile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fix compilation of dibbler package
-
-A header file is included that is not needed, and even breaks
-compilation on recent kernels. Remove it.
-
-Signed-off-by: Remy Bohmer <linux@bohmer.net>
----
- Port-linux/utils.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-Index: dibbler-0.7.3/Port-linux/utils.c
-===================================================================
---- dibbler-0.7.3.orig/Port-linux/utils.c
-+++ dibbler-0.7.3/Port-linux/utils.c
-@@ -14,6 +14,7 @@
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
- */
-
-+#define GNU_SOURCE
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -26,7 +27,7 @@
- #include <arpa/inet.h>
- #include <resolv.h>
- #include <asm/types.h>
--#include <linux/pkt_sched.h>
-+/*#include <linux/pkt_sched.h>*/
- #include <time.h>
- #include <sys/time.h>
-
diff --git a/patches/dibbler-0.7.3/fix-incremental-build.patch b/patches/dibbler-0.7.3/fix-incremental-build.patch
deleted file mode 100644
index cf56d96..0000000
--- a/patches/dibbler-0.7.3/fix-incremental-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix incremental build of dibbler package
-
-The make install fails if the changelog.gz already exists.
-So, the repair incremental builds make sure the changelog.gz
-file does not exist before generating a new one.
-
-Signed-off-by: Remy Bohmer <linux@bohmer.net>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: dibbler-0.7.3/Makefile
-===================================================================
---- dibbler-0.7.3.orig/Makefile
-+++ dibbler-0.7.3/Makefile
-@@ -428,7 +428,7 @@ install:
- $(INSTALL) -m 644 doc/dibbler-devel.pdf $(INST_DOCDIR)/dibbler/dibbler-devel.pdf
- @echo "[INSTALL] CHANGELOG"
- $(INSTALL) -m 644 CHANGELOG $(INST_DOCDIR)/dibbler/changelog
-- gzip -9 $(INST_DOCDIR)/dibbler/changelog
-+ gzip -f -9 $(INST_DOCDIR)/dibbler/changelog
-
- DIR=`basename $(PWD)`
-
diff --git a/patches/dibbler-0.7.3/merge-dns-search.patch b/patches/dibbler-0.7.3/merge-dns-search.patch
deleted file mode 100644
index 0792843..0000000
--- a/patches/dibbler-0.7.3/merge-dns-search.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Merge DNS search tables between IPv4 and IPv6
-
-Without this patch the IPv4 search tables will be overwritten
-once an IPv6 domain is added. With this patch both tables
-will be merged.
-
-Signed-off-by: Bart vdr. Meulen <bartvdrmeulen@gmail.com>
-Signed-off-by: Remy Bohmer <linux@bohmer.net>
----
- Port-linux/lowlevel-options-linux.c | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-Index: dibbler-0.7.3/Port-linux/lowlevel-options-linux.c
-===================================================================
---- dibbler-0.7.3.orig/Port-linux/lowlevel-options-linux.c
-+++ dibbler-0.7.3/Port-linux/lowlevel-options-linux.c
-@@ -199,11 +199,14 @@ int domain_add(const char* ifname, int i
- return LOWLEVEL_ERROR_FILE;
- while (fgets(buf,511,f)) {
- if ( (!found) && (strstr(buf, "search")) ) {
-- if (strlen(buf))
-- buf[strlen(buf)-1]=0;
-- fprintf(f2, "%s %s\n", buf, domain);
-- found = 1;
-- continue;
-+ if (!strstr(buf,domain)) {
-+ if (strlen(buf))
-+ buf[strlen(buf)-1]=0;
-+ fprintf(f2, "%s %s\n", buf, domain);
-+ found = 1;
-+ continue;
-+ }
-+
- }
- fprintf(f2,"%s",buf);
- }
diff --git a/patches/dibbler-0.7.3/series b/patches/dibbler-0.7.3/series
deleted file mode 100644
index b492525..0000000
--- a/patches/dibbler-0.7.3/series
+++ /dev/null
@@ -1,3 +0,0 @@
-merge-dns-search.patch
-fix-compile.patch
-fix-incremental-build.patch
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 16/28] e2fsprogs: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (13 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 15/28] dibbler: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 17/28] efax: " Robert Schwebel
` (11 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
.../0001-Fixed-bitops.h-for-Coldfire-V4E.patch | 30 ++++++++++++++++++++
.../0002-fix-linking-problem.patch | 28 ++++++++++++++++++
.../coldfire-v4e-compilefix.patch | 27 ------------------
.../e2fsprogs-1.41.14/fix-libblkid-linking.diff | 24 ----------------
patches/e2fsprogs-1.41.14/series | 2 -
5 files changed, 58 insertions(+), 53 deletions(-)
create mode 100644 patches/e2fsprogs-1.41.14/0001-Fixed-bitops.h-for-Coldfire-V4E.patch
create mode 100644 patches/e2fsprogs-1.41.14/0002-fix-linking-problem.patch
delete mode 100644 patches/e2fsprogs-1.41.14/coldfire-v4e-compilefix.patch
delete mode 100644 patches/e2fsprogs-1.41.14/fix-libblkid-linking.diff
delete mode 100644 patches/e2fsprogs-1.41.14/series
diff --git a/patches/e2fsprogs-1.41.14/0001-Fixed-bitops.h-for-Coldfire-V4E.patch b/patches/e2fsprogs-1.41.14/0001-Fixed-bitops.h-for-Coldfire-V4E.patch
new file mode 100644
index 0000000..d5c938f
--- /dev/null
+++ b/patches/e2fsprogs-1.41.14/0001-Fixed-bitops.h-for-Coldfire-V4E.patch
@@ -0,0 +1,30 @@
+From 164fd99430e3115feed20f727938d66d3905b961 Mon Sep 17 00:00:00 2001
+From: Carsten Schlote <schlote@vahanus.net>
+Date: Tue, 11 Mar 2008 00:32:20 +0100
+Subject: [PATCH 1/2] Fixed bitops.h for Coldfire V4E
+
+Commented out assembly inline code for mc68020 or higher.
+These mnemonics aren't available on Coldfire. Using C routines
+now.
+
+Signed-off-by: Carsten Schlote <schlote@vahanus.net>
+---
+ lib/ext2fs/bitops.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/ext2fs/bitops.h b/lib/ext2fs/bitops.h
+index ce70539..7e05ec3 100644
+--- a/lib/ext2fs/bitops.h
++++ b/lib/ext2fs/bitops.h
+@@ -244,7 +244,7 @@ _INLINE_ __u16 ext2fs_swab16(__u16 val)
+ #endif /* i386 */
+
+ #if ((defined __GNUC__) && !defined(_EXT2_USE_C_VERSIONS_) && \
+- (defined(__mc68000__)))
++ (defined(__mc68000__)) && !defined(__mcoldfire__))
+
+ #define _EXT2_HAVE_ASM_BITOPS_
+
+--
+1.7.7
+
diff --git a/patches/e2fsprogs-1.41.14/0002-fix-linking-problem.patch b/patches/e2fsprogs-1.41.14/0002-fix-linking-problem.patch
new file mode 100644
index 0000000..e7dba9b
--- /dev/null
+++ b/patches/e2fsprogs-1.41.14/0002-fix-linking-problem.patch
@@ -0,0 +1,28 @@
+From 43b0f9d24cc6a92286775d6e0a4f09943658a98b Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 29 Oct 2011 19:11:54 +0200
+Subject: [PATCH 2/2] fix linking problem
+
+libblkid gets the wrong linker path. This results in link errors for e2fsck.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ lib/blkid/Makefile.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/blkid/Makefile.in b/lib/blkid/Makefile.in
+index e89318e..2e125b3 100644
+--- a/lib/blkid/Makefile.in
++++ b/lib/blkid/Makefile.in
+@@ -36,7 +36,7 @@ ELF_SO_VERSION = 1
+ ELF_IMAGE = libblkid
+ ELF_MYDIR = blkid
+ ELF_INSTALL_DIR = $(root_libdir)
+-ELF_OTHER_LIBS = -L../.. -luuid
++ELF_OTHER_LIBS = ../../libuuid.so
+
+ BSDLIB_VERSION = 2.0
+ BSDLIB_IMAGE = libblkid
+--
+1.7.7
+
diff --git a/patches/e2fsprogs-1.41.14/coldfire-v4e-compilefix.patch b/patches/e2fsprogs-1.41.14/coldfire-v4e-compilefix.patch
deleted file mode 100644
index 3acbd9a..0000000
--- a/patches/e2fsprogs-1.41.14/coldfire-v4e-compilefix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Carsten Schlote <schlote@vahanus.net>
-Date: Tue, 11 Mar 2008 00:32:20 +0100
-Subject: [PATCH] [e2fsprogs-1.40.4] Fixed bitops.h for Coldfire V4E
-
-Commented out assembly inline code for mc68020 or higher.
-These mnemonics aren't available on Coldfire. Using C routines
-now.
-
-Signed-off-by: Carsten Schlote <schlote@vahanus.net>
-
----
- lib/ext2fs/bitops.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: e2fsprogs-1.41.12/lib/ext2fs/bitops.h
-===================================================================
---- e2fsprogs-1.41.12.orig/lib/ext2fs/bitops.h
-+++ e2fsprogs-1.41.12/lib/ext2fs/bitops.h
-@@ -244,7 +244,7 @@ _INLINE_ __u16 ext2fs_swab16(__u16 val)
- #endif /* i386 */
-
- #if ((defined __GNUC__) && !defined(_EXT2_USE_C_VERSIONS_) && \
-- (defined(__mc68000__)))
-+ (defined(__mc68000__)) && !defined(__mcoldfire__))
-
- #define _EXT2_HAVE_ASM_BITOPS_
-
diff --git a/patches/e2fsprogs-1.41.14/fix-libblkid-linking.diff b/patches/e2fsprogs-1.41.14/fix-libblkid-linking.diff
deleted file mode 100644
index 8fe5d44..0000000
--- a/patches/e2fsprogs-1.41.14/fix-libblkid-linking.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Subject: fix linking problem
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-
-libblkid gets the wrong linker path. This results in link errors for e2fsck.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- lib/blkid/Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: e2fsprogs-1.41.12/lib/blkid/Makefile.in
-===================================================================
---- e2fsprogs-1.41.12.orig/lib/blkid/Makefile.in
-+++ e2fsprogs-1.41.12/lib/blkid/Makefile.in
-@@ -36,7 +36,7 @@ ELF_SO_VERSION = 1
- ELF_IMAGE = libblkid
- ELF_MYDIR = blkid
- ELF_INSTALL_DIR = $(root_libdir)
--ELF_OTHER_LIBS = -L../.. -luuid
-+ELF_OTHER_LIBS = ../../libuuid.so
-
- BSDLIB_VERSION = 2.0
- BSDLIB_IMAGE = libblkid
diff --git a/patches/e2fsprogs-1.41.14/series b/patches/e2fsprogs-1.41.14/series
deleted file mode 100644
index a5628d6..0000000
--- a/patches/e2fsprogs-1.41.14/series
+++ /dev/null
@@ -1,2 +0,0 @@
-coldfire-v4e-compilefix.patch
-fix-libblkid-linking.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 17/28] efax: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (14 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 16/28] e2fsprogs: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 18/28] eggdbus: " Robert Schwebel
` (10 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
patches/efax-0.9/0001-fix-rd_state.patch | 28 +++++++++++
patches/efax-0.9/0002-add-nullpointer-check.patch | 50 ++++++++++++++++++++
patches/efax-0.9/0003-fix-l-option-in-efix.patch | 44 +++++++++++++++++
.../efax-0.9/0004-add-missing-include-file.patch | 25 ++++++++++
patches/efax-0.9/efax-0.9-misc.patch | 22 ---------
patches/efax-0.9/efax-0.9-nullptr.patch | 42 ----------------
patches/efax-0.9/efax-0.9-numlines.patch | 38 ---------------
patches/efax-0.9/efax08a-time.patch | 19 -------
patches/efax-0.9/series | 4 --
9 files changed, 147 insertions(+), 125 deletions(-)
create mode 100644 patches/efax-0.9/0001-fix-rd_state.patch
create mode 100644 patches/efax-0.9/0002-add-nullpointer-check.patch
create mode 100644 patches/efax-0.9/0003-fix-l-option-in-efix.patch
create mode 100644 patches/efax-0.9/0004-add-missing-include-file.patch
delete mode 100644 patches/efax-0.9/efax-0.9-misc.patch
delete mode 100644 patches/efax-0.9/efax-0.9-nullptr.patch
delete mode 100644 patches/efax-0.9/efax-0.9-numlines.patch
delete mode 100644 patches/efax-0.9/efax08a-time.patch
delete mode 100644 patches/efax-0.9/series
diff --git a/patches/efax-0.9/0001-fix-rd_state.patch b/patches/efax-0.9/0001-fix-rd_state.patch
new file mode 100644
index 0000000..3179248
--- /dev/null
+++ b/patches/efax-0.9/0001-fix-rd_state.patch
@@ -0,0 +1,28 @@
+From fa03dff46d41a509c4cfbb81d132ca6b6e408f00 Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sat, 29 Oct 2011 19:13:38 +0200
+Subject: [PATCH 1/4] fix rd_state
+
+Patch taken from redhat.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ efax.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/efax.c b/efax.c
+index 42880d2..bdcd462 100644
+--- a/efax.c
++++ b/efax.c
+@@ -759,7 +759,7 @@ int readfaxruns ( TFILE *f, DECODER *d, short *runs, int *pels )
+ c = tgetd ( f, TO_CHAR ) ;
+
+ rd_state = ( rd_state & rd_allowed[c] ) ?
+- ( ( rd_state & rd_nexts[c] ) ? rd_state <<= 1 : rd_state ) :
++ ( ( rd_state & rd_nexts[c] ) ? rd_state << 1 : rd_state ) :
+ RD_BEGIN ;
+
+ if ( rd_state == RD_END )
+--
+1.7.7
+
diff --git a/patches/efax-0.9/0002-add-nullpointer-check.patch b/patches/efax-0.9/0002-add-nullpointer-check.patch
new file mode 100644
index 0000000..38e5a0d
--- /dev/null
+++ b/patches/efax-0.9/0002-add-nullpointer-check.patch
@@ -0,0 +1,50 @@
+From c19adac8ff45c15175263af94c818d7f9d7061a8 Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sat, 29 Oct 2011 19:13:38 +0200
+Subject: [PATCH 2/4] add nullpointer check
+
+Patch taken from redhat.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ efax.c | 1 +
+ efaxos.c | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/efax.c b/efax.c
+index bdcd462..28f7fca 100644
+--- a/efax.c
++++ b/efax.c
+@@ -2186,6 +2186,7 @@ int main( int argc, char **argv)
+
+ /* print initial message to both stderr & stdout */
+ argv0 = argv[0] ;
++ memset((void *)lkfile, 0, sizeof(lkfile)); /* random effects on sparc linux */
+ verb[1] = "ewia" ;
+ msg ( "I " Version " " Copyright ) ;
+ argv0 = efaxbasename ( argv0 ) ;
+diff --git a/efaxos.c b/efaxos.c
+index 6b346d6..dc3ae33 100644
+--- a/efaxos.c
++++ b/efaxos.c
+@@ -482,7 +482,7 @@ int lockall ( char **lkfiles, int log )
+ {
+ int err = 0 ;
+ char **p = lkfiles ;
+- while ( *p && ! err )
++ while ( *p && **p && ! err )
+ if ( ( err = ttlock ( *p++, log ) ) == 3 ) err = 0 ;
+ return err ;
+ }
+@@ -495,7 +495,7 @@ int unlockall ( char **lkfiles )
+ {
+ int err = 0, i ;
+ char **p = lkfiles ;
+- while ( *p )
++ while ( *p && **p )
+ if ( ( i = ttunlock ( *p++ ) ) != 0 ) err = i ;
+ return err ;
+ }
+--
+1.7.7
+
diff --git a/patches/efax-0.9/0003-fix-l-option-in-efix.patch b/patches/efax-0.9/0003-fix-l-option-in-efix.patch
new file mode 100644
index 0000000..75af458
--- /dev/null
+++ b/patches/efax-0.9/0003-fix-l-option-in-efix.patch
@@ -0,0 +1,44 @@
+From 150269460c978caf2eac057fff4ac9baaf30aede Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sat, 29 Oct 2011 19:13:38 +0200
+Subject: [PATCH 3/4] fix -l option in efix
+
+This patch fixes the '-l' option in efix 0.3 which is part of efax 0.9.
+Without this patch, lines on page 2 and subsequent are missing if the
+specified number of lines per page is lower than the default (66).
+
+This patch was taken from redhat, probably first written by
+mschwendt@yahoo.com.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ efix.c | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/efix.c b/efix.c
+index 57f96ff..984f158 100644
+--- a/efix.c
++++ b/efix.c
+@@ -297,6 +297,9 @@ int main( int argc, char **argv)
+
+ if ( ! err && ! done ) {
+
++ if ( pfont ) ifile.font = pfont ;
++ if ( pglines ) ifile.pglines = pglines ;
++
+ if ( nxtoptind < argc ) {
+ ifnames = argv + nxtoptind ;
+ if ( argv [ argc ] ) {
+@@ -308,9 +311,6 @@ int main( int argc, char **argv)
+ err = msg ( "E3 missing input file name" ) ;
+ }
+
+- if ( pfont ) ifile.font = pfont ;
+- if ( pglines ) ifile.pglines = pglines ;
+-
+ newIFILE ( &ovfile, ovfnames ) ;
+
+ newOFILE ( &ofile, oformat, ofname, 0, 0, 0, 0 ) ;
+--
+1.7.7
+
diff --git a/patches/efax-0.9/0004-add-missing-include-file.patch b/patches/efax-0.9/0004-add-missing-include-file.patch
new file mode 100644
index 0000000..f3fe041
--- /dev/null
+++ b/patches/efax-0.9/0004-add-missing-include-file.patch
@@ -0,0 +1,25 @@
+From 9034141533a34c4497e91d00fbe4f00b278ff60f Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sat, 29 Oct 2011 19:13:38 +0200
+Subject: [PATCH 4/4] add missing include file
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ efaxio.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/efaxio.c b/efaxio.c
+index 5b8dbde..1e3a1fd 100644
+--- a/efaxio.c
++++ b/efaxio.c
+@@ -2,6 +2,7 @@
+ #include <signal.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <time.h>
+
+ #include "efaxio.h" /* EFAX */
+ #include "efaxmsg.h"
+--
+1.7.7
+
diff --git a/patches/efax-0.9/efax-0.9-misc.patch b/patches/efax-0.9/efax-0.9-misc.patch
deleted file mode 100644
index 34ae3cf..0000000
--- a/patches/efax-0.9/efax-0.9-misc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: [efax] fix rd_state
-
-Patch taken from redhat.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- efax.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/efax.c
-+++ b/efax.c
-@@ -759,7 +759,7 @@ int readfaxruns ( TFILE *f, DECODER *d,
- c = tgetd ( f, TO_CHAR ) ;
-
- rd_state = ( rd_state & rd_allowed[c] ) ?
-- ( ( rd_state & rd_nexts[c] ) ? rd_state <<= 1 : rd_state ) :
-+ ( ( rd_state & rd_nexts[c] ) ? rd_state << 1 : rd_state ) :
- RD_BEGIN ;
-
- if ( rd_state == RD_END )
diff --git a/patches/efax-0.9/efax-0.9-nullptr.patch b/patches/efax-0.9/efax-0.9-nullptr.patch
deleted file mode 100644
index 9820248..0000000
--- a/patches/efax-0.9/efax-0.9-nullptr.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: [efax] add nullpointer check
-
-Patch taken from redhat.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- efax.c | 1 +
- efaxos.c | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
---- a/efax.c
-+++ b/efax.c
-@@ -2186,6 +2186,7 @@ int main( int argc, char **argv)
-
- /* print initial message to both stderr & stdout */
- argv0 = argv[0] ;
-+ memset((void *)lkfile, 0, sizeof(lkfile)); /* random effects on sparc linux */
- verb[1] = "ewia" ;
- msg ( "I " Version " " Copyright ) ;
- argv0 = efaxbasename ( argv0 ) ;
---- a/efaxos.c
-+++ b/efaxos.c
-@@ -482,7 +482,7 @@ int lockall ( char **lkfiles, int log )
- {
- int err = 0 ;
- char **p = lkfiles ;
-- while ( *p && ! err )
-+ while ( *p && **p && ! err )
- if ( ( err = ttlock ( *p++, log ) ) == 3 ) err = 0 ;
- return err ;
- }
-@@ -495,7 +495,7 @@ int unlockall ( char **lkfiles )
- {
- int err = 0, i ;
- char **p = lkfiles ;
-- while ( *p )
-+ while ( *p && **p )
- if ( ( i = ttunlock ( *p++ ) ) != 0 ) err = i ;
- return err ;
- }
diff --git a/patches/efax-0.9/efax-0.9-numlines.patch b/patches/efax-0.9/efax-0.9-numlines.patch
deleted file mode 100644
index 5162de4..0000000
--- a/patches/efax-0.9/efax-0.9-numlines.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: [efax] fix -l option in efix
-
-This patch fixes the '-l' option in efix 0.3 which is part of efax 0.9.
-Without this patch, lines on page 2 and subsequent are missing if the
-specified number of lines per page is lower than the default (66).
-
-This patch was taken from redhat, probably first written by
-mschwendt@yahoo.com.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- efix.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/efix.c
-+++ b/efix.c
-@@ -297,6 +297,9 @@ int main( int argc, char **argv)
-
- if ( ! err && ! done ) {
-
-+ if ( pfont ) ifile.font = pfont ;
-+ if ( pglines ) ifile.pglines = pglines ;
-+
- if ( nxtoptind < argc ) {
- ifnames = argv + nxtoptind ;
- if ( argv [ argc ] ) {
-@@ -308,9 +311,6 @@ int main( int argc, char **argv)
- err = msg ( "E3 missing input file name" ) ;
- }
-
-- if ( pfont ) ifile.font = pfont ;
-- if ( pglines ) ifile.pglines = pglines ;
--
- newIFILE ( &ovfile, ovfnames ) ;
-
- newOFILE ( &ofile, oformat, ofname, 0, 0, 0, 0 ) ;
diff --git a/patches/efax-0.9/efax08a-time.patch b/patches/efax-0.9/efax08a-time.patch
deleted file mode 100644
index c35c177..0000000
--- a/patches/efax-0.9/efax08a-time.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: [efax] add missing include file
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- efaxio.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/efaxio.c
-+++ b/efaxio.c
-@@ -2,6 +2,7 @@
- #include <signal.h>
- #include <stdio.h>
- #include <string.h>
-+#include <time.h>
-
- #include "efaxio.h" /* EFAX */
- #include "efaxmsg.h"
diff --git a/patches/efax-0.9/series b/patches/efax-0.9/series
deleted file mode 100644
index a47b124..0000000
--- a/patches/efax-0.9/series
+++ /dev/null
@@ -1,4 +0,0 @@
-efax-0.9-misc.patch
-efax-0.9-nullptr.patch
-efax-0.9-numlines.patch
-efax08a-time.patch
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 18/28] eggdbus: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (15 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 17/28] efax: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 19/28] elektra: remove orphaned package Robert Schwebel
` (9 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
.../0001-make-eggdbus-crosscompile-aware.patch | 55 +++++++++
...build-tests-only-when-not-cross-compiling.patch | 50 ++++++++
.../eggdbus-0.6/0003-update-autotoolization.patch | 128 ++++++++++++++++++++
patches/eggdbus-0.6/0004-fix-dependencies.patch | 28 +++++
patches/eggdbus-0.6/eggdbus-0.6-autotools.diff | 123 -------------------
patches/eggdbus-0.6/eggdbus-0.6-fix-deps.diff | 23 ----
patches/eggdbus-0.6/eggdbus-0.6-host-tools.diff | 51 --------
patches/eggdbus-0.6/eggdbus-0.6-no-tests.diff | 46 -------
patches/eggdbus-0.6/series | 4 -
9 files changed, 261 insertions(+), 247 deletions(-)
create mode 100644 patches/eggdbus-0.6/0001-make-eggdbus-crosscompile-aware.patch
create mode 100644 patches/eggdbus-0.6/0002-build-tests-only-when-not-cross-compiling.patch
create mode 100644 patches/eggdbus-0.6/0003-update-autotoolization.patch
create mode 100644 patches/eggdbus-0.6/0004-fix-dependencies.patch
delete mode 100644 patches/eggdbus-0.6/eggdbus-0.6-autotools.diff
delete mode 100644 patches/eggdbus-0.6/eggdbus-0.6-fix-deps.diff
delete mode 100644 patches/eggdbus-0.6/eggdbus-0.6-host-tools.diff
delete mode 100644 patches/eggdbus-0.6/eggdbus-0.6-no-tests.diff
delete mode 100644 patches/eggdbus-0.6/series
diff --git a/patches/eggdbus-0.6/0001-make-eggdbus-crosscompile-aware.patch b/patches/eggdbus-0.6/0001-make-eggdbus-crosscompile-aware.patch
new file mode 100644
index 0000000..39131de
--- /dev/null
+++ b/patches/eggdbus-0.6/0001-make-eggdbus-crosscompile-aware.patch
@@ -0,0 +1,55 @@
+From 23dfa7c24cc1becc6e841cf8f803c4249c4944bb Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sat, 29 Oct 2011 19:14:59 +0200
+Subject: [PATCH 1/4] make eggdbus crosscompile aware
+
+The build system compiles tools like eggdbus-glib-genmarshal and
+eggdbus-binding-tool; if you cross compile the package, these fines are
+built for the "host" architecture, not for the "build" one, but the
+Makefile tries to run the cross compiled binaries then.
+
+Make it possible to overwrite them from the configure command line.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ configure.ac | 10 ++++++++++
+ src/eggdbus/Makefile.am | 2 +-
+ 2 files changed, 11 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 497cb7f..a4e792a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,6 +34,16 @@ AM_CONDITIONAL(MAN_PAGES_ENABLED, test x$enable_man_pages = xyes)
+
+ GTK_DOC_CHECK([1.3])
+
++EGGDBUS_TOOLS=""
++AC_ARG_WITH(eggdbus-tools,
++ AS_HELP_STRING([--with-eggdbus-tools],[path to eggdbus-binding-tool (for cross compilation)]),
++[
++ EGGDBUS_TOOLS="$withval"
++],[
++ EGGDBUS_TOOLS="\$(top_builddir)/src/eggdbus"
++])
++AC_SUBST(EGGDBUS_TOOLS)
++
+ #### gcc warning flags
+
+ if test "x$GCC" = "xyes"; then
+diff --git a/src/eggdbus/Makefile.am b/src/eggdbus/Makefile.am
+index aebb984..95615cd 100644
+--- a/src/eggdbus/Makefile.am
++++ b/src/eggdbus/Makefile.am
+@@ -130,7 +130,7 @@ BUILT_SOURCES = \
+ $(NULL)
+
+ eggdbus-built-sources.stamp : eggdbus-binding-tool Makefile.am org.freedesktop.DBus.xml org.freedesktop.DBus.Peer.xml org.freedesktop.DBus.Properties.xml org.freedesktop.DBus.Introspectable.xml eggdbus-glib-genmarshal
+- EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool \
++ EGG_DBUS_GENMARSHAL=$(EGGDBUS_TOOLS)/eggdbus-glib-genmarshal $(EGGDBUS_TOOLS)/eggdbus-binding-tool \
+ --namespace EggDBus \
+ --dbus-namespace org.freedesktop.DBus \
+ --interfaces-only \
+--
+1.7.7
+
diff --git a/patches/eggdbus-0.6/0002-build-tests-only-when-not-cross-compiling.patch b/patches/eggdbus-0.6/0002-build-tests-only-when-not-cross-compiling.patch
new file mode 100644
index 0000000..7f6b643
--- /dev/null
+++ b/patches/eggdbus-0.6/0002-build-tests-only-when-not-cross-compiling.patch
@@ -0,0 +1,50 @@
+From 5b0b8a6846941919d6f1b87dbe1329cdafbcaa8c Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sat, 29 Oct 2011 19:14:59 +0200
+Subject: [PATCH 2/4] build tests only when not cross compiling
+
+When building the tests, the makefiles try to run
+eggdbus-glib-genmarshal and eggdbus-binding-tool, but this doesn't
+really make any sense when cross compiling.
+
+The patch below disables the tests completely when cross compiling.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ configure.ac | 2 ++
+ src/Makefile.am | 8 +++++++-
+ 2 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a4e792a..0f31dea 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -44,6 +44,8 @@ AC_ARG_WITH(eggdbus-tools,
+ ])
+ AC_SUBST(EGGDBUS_TOOLS)
+
++AM_CONDITIONAL([CROSS_COMPILE], [test "${cross_compiling}" = yes])
++
+ #### gcc warning flags
+
+ if test "x$GCC" = "xyes"; then
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 60fb584..cec7e43 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,5 +1,11 @@
+
+-SUBDIRS = eggdbus tests
++if CROSS_COMPILE
++TESTDIR=
++else
++TESTDIR=tests
++endif
++
++SUBDIRS = eggdbus $(TESTDIR)
+
+ clean-local :
+ rm -f *~
+--
+1.7.7
+
diff --git a/patches/eggdbus-0.6/0003-update-autotoolization.patch b/patches/eggdbus-0.6/0003-update-autotoolization.patch
new file mode 100644
index 0000000..8fdf33e
--- /dev/null
+++ b/patches/eggdbus-0.6/0003-update-autotoolization.patch
@@ -0,0 +1,128 @@
+From 0823435d4863aa94d0d47a672beaba462559b645 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 29 Oct 2011 19:14:59 +0200
+Subject: [PATCH 3/4] update autotoolization
+
+This patch updates the autotool-infrastructure for recent tools.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ Makefile.am | 2 ++
+ configure.ac | 15 ++++++++-------
+ docs/eggdbus/Makefile.am | 2 +-
+ docs/tests/Makefile.am | 2 +-
+ src/eggdbus/Makefile.am | 2 +-
+ src/tests/Makefile.am | 2 +-
+ 6 files changed, 14 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index c1f1470..9ab8648 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+
++ACLOCAL_AMFLAGS = -I m4
++
+ SUBDIRS = src docs
+
+ NULL =
+diff --git a/configure.ac b/configure.ac
+index 0f31dea..5ad85af 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,16 +1,16 @@
+ dnl Process this file with autoconf to produce a configure script.
+
+-AC_PREREQ(2.59c)
+-AC_INIT(eggdbus, 0.6, davidz@redhat.com)
++AC_PREREQ(2.64)
++AC_INIT([eggdbus],[0.6],[davidz@redhat.com])
+ AM_INIT_AUTOMAKE(eggdbus, 0.6)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_MAINTAINER_MODE
+
+-AC_ISC_POSIX
+ AC_PROG_CC
+-AM_PROG_CC_STDC
++am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
++
+ AC_HEADER_STDC
+-AM_PROG_LIBTOOL
++LT_INIT
+ AC_PROG_MAKE_SET
+ AC_PROG_LN_S
+ AC_SYS_LARGEFILE
+@@ -135,7 +135,7 @@ if test "x$GCC" = "xyes"; then
+ LDFLAGS="-Wl,--as-needed $LDFLAGS"
+ fi
+
+-AC_OUTPUT([
++AC_CONFIG_FILES([
+ Makefile
+ eggdbus-1.pc
+ src/Makefile
+@@ -147,6 +147,7 @@ docs/man/Makefile
+ docs/tests/Makefile
+ docs/eggdbus/Makefile
+ ])
++AC_OUTPUT
+
+ dnl ==========================================================================
+ echo "
+diff --git a/docs/eggdbus/Makefile.am b/docs/eggdbus/Makefile.am
+index 94c00bf..e30e6c3 100644
+--- a/docs/eggdbus/Makefile.am
++++ b/docs/eggdbus/Makefile.am
+@@ -34,7 +34,7 @@ IGNORE_HFILES= \
+
+ # CFLAGS and LDFLAGS for compiling scan program. Only needed
+ # if $(DOC_MODULE).types is non-empty.
+-INCLUDES = \
++AM_CPPFLAGS = \
+ $(DBUS_GLIB_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(GIO_CFLAGS) \
+diff --git a/docs/tests/Makefile.am b/docs/tests/Makefile.am
+index 5f7940c..3ba5cba 100644
+--- a/docs/tests/Makefile.am
++++ b/docs/tests/Makefile.am
+@@ -29,7 +29,7 @@ IGNORE_HFILES= \
+
+ # CFLAGS and LDFLAGS for compiling scan program. Only needed
+ # if $(DOC_MODULE).types is non-empty.
+-INCLUDES = \
++AM_CPPFLAGS = \
+ $(DBUS_GLIB_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(GIO_CFLAGS) \
+diff --git a/src/eggdbus/Makefile.am b/src/eggdbus/Makefile.am
+index 95615cd..0f96181 100644
+--- a/src/eggdbus/Makefile.am
++++ b/src/eggdbus/Makefile.am
+@@ -1,7 +1,7 @@
+
+ NULL =
+
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -I$(top_builddir)/src \
+ -I$(top_srcdir)/src \
+ -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
+diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
+index 7bc1b24..71a3e82 100644
+--- a/src/tests/Makefile.am
++++ b/src/tests/Makefile.am
+@@ -1,7 +1,7 @@
+
+ NULL =
+
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -I$(top_builddir)/src \
+ -I$(top_srcdir)/src \
+ -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
+--
+1.7.7
+
diff --git a/patches/eggdbus-0.6/0004-fix-dependencies.patch b/patches/eggdbus-0.6/0004-fix-dependencies.patch
new file mode 100644
index 0000000..afb1b56
--- /dev/null
+++ b/patches/eggdbus-0.6/0004-fix-dependencies.patch
@@ -0,0 +1,28 @@
+From 4a60935e13594350f9a58fc2e4ae8945b0e5af5b Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 29 Oct 2011 19:14:59 +0200
+Subject: [PATCH 4/4] fix dependencies
+
+sone source files of eggdbus-binding-tool need eggdbusenumtypes.h
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/eggdbus/Makefile.am | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/eggdbus/Makefile.am b/src/eggdbus/Makefile.am
+index 0f96181..ab0269d 100644
+--- a/src/eggdbus/Makefile.am
++++ b/src/eggdbus/Makefile.am
+@@ -81,6 +81,8 @@ eggdbus_binding_tool_SOURCES = \
+ completetype.c completetype.h \
+ $(NULL)
+
++$(eggdbus_binding_tool_SOURCES) $(libeggdbus_common_la_SOURCES): eggdbusenumtypes.h
++
+ eggdbus_binding_tool_CFLAGS = \
+ -D_EGG_DBUS_COMPILATION \
+ $(GLIB_CFLAGS) \
+--
+1.7.7
+
diff --git a/patches/eggdbus-0.6/eggdbus-0.6-autotools.diff b/patches/eggdbus-0.6/eggdbus-0.6-autotools.diff
deleted file mode 100644
index 2cc8997..0000000
--- a/patches/eggdbus-0.6/eggdbus-0.6-autotools.diff
+++ /dev/null
@@ -1,123 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: update autotoolization
-
-This patch updates the autotool-infrastructure for recent tools.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- Makefile.am | 2 ++
- configure.ac | 15 ++++++++-------
- docs/eggdbus/Makefile.am | 2 +-
- docs/tests/Makefile.am | 2 +-
- src/eggdbus/Makefile.am | 2 +-
- src/tests/Makefile.am | 2 +-
- 6 files changed, 14 insertions(+), 11 deletions(-)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,16 +1,16 @@
- dnl Process this file with autoconf to produce a configure script.
-
--AC_PREREQ(2.59c)
--AC_INIT(eggdbus, 0.6, davidz@redhat.com)
-+AC_PREREQ(2.64)
-+AC_INIT([eggdbus],[0.6],[davidz@redhat.com])
- AM_INIT_AUTOMAKE(eggdbus, 0.6)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AM_MAINTAINER_MODE
-
--AC_ISC_POSIX
- AC_PROG_CC
--AM_PROG_CC_STDC
-+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
-+
- AC_HEADER_STDC
--AM_PROG_LIBTOOL
-+LT_INIT
- AC_PROG_MAKE_SET
- AC_PROG_LN_S
- AC_SYS_LARGEFILE
-@@ -135,7 +135,7 @@ if test "x$GCC" = "xyes"; then
- LDFLAGS="-Wl,--as-needed $LDFLAGS"
- fi
-
--AC_OUTPUT([
-+AC_CONFIG_FILES([
- Makefile
- eggdbus-1.pc
- src/Makefile
-@@ -147,6 +147,7 @@ docs/man/Makefile
- docs/tests/Makefile
- docs/eggdbus/Makefile
- ])
-+AC_OUTPUT
-
- dnl ==========================================================================
- echo "
-Index: b/docs/eggdbus/Makefile.am
-===================================================================
---- a/docs/eggdbus/Makefile.am
-+++ b/docs/eggdbus/Makefile.am
-@@ -34,7 +34,7 @@ IGNORE_HFILES= \
-
- # CFLAGS and LDFLAGS for compiling scan program. Only needed
- # if $(DOC_MODULE).types is non-empty.
--INCLUDES = \
-+AM_CPPFLAGS = \
- $(DBUS_GLIB_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(GIO_CFLAGS) \
-Index: b/docs/tests/Makefile.am
-===================================================================
---- a/docs/tests/Makefile.am
-+++ b/docs/tests/Makefile.am
-@@ -29,7 +29,7 @@ IGNORE_HFILES= \
-
- # CFLAGS and LDFLAGS for compiling scan program. Only needed
- # if $(DOC_MODULE).types is non-empty.
--INCLUDES = \
-+AM_CPPFLAGS = \
- $(DBUS_GLIB_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(GIO_CFLAGS) \
-Index: b/src/eggdbus/Makefile.am
-===================================================================
---- a/src/eggdbus/Makefile.am
-+++ b/src/eggdbus/Makefile.am
-@@ -1,7 +1,7 @@
-
- NULL =
-
--INCLUDES = \
-+AM_CPPFLAGS = \
- -I$(top_builddir)/src \
- -I$(top_srcdir)/src \
- -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
-Index: b/src/tests/Makefile.am
-===================================================================
---- a/src/tests/Makefile.am
-+++ b/src/tests/Makefile.am
-@@ -1,7 +1,7 @@
-
- NULL =
-
--INCLUDES = \
-+AM_CPPFLAGS = \
- -I$(top_builddir)/src \
- -I$(top_srcdir)/src \
- -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
-Index: b/Makefile.am
-===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,5 +1,7 @@
- ## Process this file with automake to produce Makefile.in
-
-+ACLOCAL_AMFLAGS = -I m4
-+
- SUBDIRS = src docs
-
- NULL =
diff --git a/patches/eggdbus-0.6/eggdbus-0.6-fix-deps.diff b/patches/eggdbus-0.6/eggdbus-0.6-fix-deps.diff
deleted file mode 100644
index dfd6998..0000000
--- a/patches/eggdbus-0.6/eggdbus-0.6-fix-deps.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: fix dependencies
-
-sone source files of eggdbus-binding-tool need eggdbusenumtypes.h
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/eggdbus/Makefile.am | 2 ++
- 1 file changed, 2 insertions(+)
-
-Index: b/src/eggdbus/Makefile.am
-===================================================================
---- a/src/eggdbus/Makefile.am
-+++ b/src/eggdbus/Makefile.am
-@@ -81,6 +81,8 @@ eggdbus_binding_tool_SOURCES = \
- completetype.c completetype.h \
- $(NULL)
-
-+$(eggdbus_binding_tool_SOURCES) $(libeggdbus_common_la_SOURCES): eggdbusenumtypes.h
-+
- eggdbus_binding_tool_CFLAGS = \
- -D_EGG_DBUS_COMPILATION \
- $(GLIB_CFLAGS) \
diff --git a/patches/eggdbus-0.6/eggdbus-0.6-host-tools.diff b/patches/eggdbus-0.6/eggdbus-0.6-host-tools.diff
deleted file mode 100644
index 615af6b..0000000
--- a/patches/eggdbus-0.6/eggdbus-0.6-host-tools.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-Subject: [patch] make eggdbus crosscompile aware
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-
-The build system compiles tools like eggdbus-glib-genmarshal and
-eggdbus-binding-tool; if you cross compile the package, these fines are
-built for the "host" architecture, not for the "build" one, but the
-Makefile tries to run the cross compiled binaries then.
-
-Make it possible to overwrite them from the configure command line.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- configure.ac | 10 ++++++++++
- src/eggdbus/Makefile.am | 2 +-
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-Index: eggdbus-0.6/configure.ac
-===================================================================
---- eggdbus-0.6.orig/configure.ac
-+++ eggdbus-0.6/configure.ac
-@@ -34,6 +34,16 @@ AM_CONDITIONAL(MAN_PAGES_ENABLED, test x
-
- GTK_DOC_CHECK([1.3])
-
-+EGGDBUS_TOOLS=""
-+AC_ARG_WITH(eggdbus-tools,
-+ AS_HELP_STRING([--with-eggdbus-tools],[path to eggdbus-binding-tool (for cross compilation)]),
-+[
-+ EGGDBUS_TOOLS="$withval"
-+],[
-+ EGGDBUS_TOOLS="\$(top_builddir)/src/eggdbus"
-+])
-+AC_SUBST(EGGDBUS_TOOLS)
-+
- #### gcc warning flags
-
- if test "x$GCC" = "xyes"; then
-Index: eggdbus-0.6/src/eggdbus/Makefile.am
-===================================================================
---- eggdbus-0.6.orig/src/eggdbus/Makefile.am
-+++ eggdbus-0.6/src/eggdbus/Makefile.am
-@@ -130,7 +130,7 @@ BUILT_SOURCES = \
- $(NULL)
-
- eggdbus-built-sources.stamp : eggdbus-binding-tool Makefile.am org.freedesktop.DBus.xml org.freedesktop.DBus.Peer.xml org.freedesktop.DBus.Properties.xml org.freedesktop.DBus.Introspectable.xml eggdbus-glib-genmarshal
-- EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool \
-+ EGG_DBUS_GENMARSHAL=$(EGGDBUS_TOOLS)/eggdbus-glib-genmarshal $(EGGDBUS_TOOLS)/eggdbus-binding-tool \
- --namespace EggDBus \
- --dbus-namespace org.freedesktop.DBus \
- --interfaces-only \
diff --git a/patches/eggdbus-0.6/eggdbus-0.6-no-tests.diff b/patches/eggdbus-0.6/eggdbus-0.6-no-tests.diff
deleted file mode 100644
index 2ef52ba..0000000
--- a/patches/eggdbus-0.6/eggdbus-0.6-no-tests.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-Subject: [patch] build tests only when not cross compiling
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-
-When building the tests, the makefiles try to run
-eggdbus-glib-genmarshal and eggdbus-binding-tool, but this doesn't
-really make any sense when cross compiling.
-
-The patch below disables the tests completely when cross compiling.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- configure.ac | 2 ++
- src/Makefile.am | 8 +++++++-
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -44,6 +44,8 @@ AC_ARG_WITH(eggdbus-tools,
- ])
- AC_SUBST(EGGDBUS_TOOLS)
-
-+AM_CONDITIONAL([CROSS_COMPILE], [test "${cross_compiling}" = yes])
-+
- #### gcc warning flags
-
- if test "x$GCC" = "xyes"; then
-Index: b/src/Makefile.am
-===================================================================
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,5 +1,11 @@
-
--SUBDIRS = eggdbus tests
-+if CROSS_COMPILE
-+TESTDIR=
-+else
-+TESTDIR=tests
-+endif
-+
-+SUBDIRS = eggdbus $(TESTDIR)
-
- clean-local :
- rm -f *~
diff --git a/patches/eggdbus-0.6/series b/patches/eggdbus-0.6/series
deleted file mode 100644
index 7c07041..0000000
--- a/patches/eggdbus-0.6/series
+++ /dev/null
@@ -1,4 +0,0 @@
-eggdbus-0.6-host-tools.diff
-eggdbus-0.6-no-tests.diff
-eggdbus-0.6-autotools.diff
-eggdbus-0.6-fix-deps.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 19/28] elektra: remove orphaned package
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (16 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 18/28] eggdbus: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 20/28] etherwake: clean up patches Robert Schwebel
` (8 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Elektra is upstream-dead and was most probably never used by anyone than
myself.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
patches/elektra-0.7.0-r1618/autogen.sh | 1 -
.../elektra-0.7.0-r1618-ini-debug.diff | 29 --
.../elektra-0.7.0rc5-file-existence.diff | 26 --
.../elektra-0.7.0rc5-libxml2.diff | 40 ---
.../elektra-0.7.0rc5-static-libs.diff | 105 --------
patches/elektra-0.7.0-r1618/series | 4 -
rules/elektra.in | 110 --------
rules/elektra.make | 271 --------------------
8 files changed, 0 insertions(+), 586 deletions(-)
delete mode 120000 patches/elektra-0.7.0-r1618/autogen.sh
delete mode 100644 patches/elektra-0.7.0-r1618/elektra-0.7.0-r1618-ini-debug.diff
delete mode 100644 patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-file-existence.diff
delete mode 100644 patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-libxml2.diff
delete mode 100644 patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-static-libs.diff
delete mode 100644 patches/elektra-0.7.0-r1618/series
delete mode 100644 rules/elektra.in
delete mode 100644 rules/elektra.make
diff --git a/patches/elektra-0.7.0-r1618/autogen.sh b/patches/elektra-0.7.0-r1618/autogen.sh
deleted file mode 120000
index 9f8a4cb..0000000
--- a/patches/elektra-0.7.0-r1618/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/elektra-0.7.0-r1618/elektra-0.7.0-r1618-ini-debug.diff b/patches/elektra-0.7.0-r1618/elektra-0.7.0-r1618-ini-debug.diff
deleted file mode 100644
index 954a21d..0000000
--- a/patches/elektra-0.7.0-r1618/elektra-0.7.0-r1618-ini-debug.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: ini backend: fix DEBUG handling
-
-When compiled without "--enable-debug", the ini backend nevertheless
-defines DEBUG and thus we get output.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- src/backends/ini/Makefile.am | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-Index: elektra-0.7.0-r1618/src/backends/ini/Makefile.am
-===================================================================
---- elektra-0.7.0-r1618.orig/src/backends/ini/Makefile.am
-+++ elektra-0.7.0-r1618/src/backends/ini/Makefile.am
-@@ -1,7 +1,11 @@
- # $Id: Makefile.am 1618 2008-10-17 16:03:11Z registry@markus-raab.org $
-
-+if DEBUG
-+INI_DEBUG=-DDEBUG
-+endif
-+
- #testdir = $(develdocdir)/src/backends/ini/
--AM_CPPFLAGS = -I$(top_srcdir)/src/include -DDEBUG -D_POSIX_SOURCE -D_BSD_SOURCE
-+AM_CPPFLAGS = -I$(top_srcdir)/src/include $(INI_DEBUG) -D_POSIX_SOURCE -D_BSD_SOURCE
-
- ini_sources = ini.c helpers.c parser.c ini.h ../../include/kdb.h ../../include/kdbbackend.h
- noinst_LIBRARIES = libelektra-ini.a
diff --git a/patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-file-existence.diff b/patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-file-existence.diff
deleted file mode 100644
index b6bb3cb..0000000
--- a/patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-file-existence.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Subject: don't break build while cross compiling
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-
-When cross compiling it may not really matter if we have the docbook xsl
-stuff (only needed for documentation). So disable the check in that
-case.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: elektra-0.7.0-r1618/configure.ac
-===================================================================
---- elektra-0.7.0-r1618.orig/configure.ac
-+++ elektra-0.7.0-r1618/configure.ac
-@@ -301,7 +301,7 @@ PKG_PROG_PKG_CONFIG
- # xsltproc
- AC_PATH_PROG(xsltproc, xsltproc, "no")
- # Check if have style-sheet too
--if test "x$default_docbook" != "xno"; then
-+if test "x$default_docbook" != "xno" && test "x$cross_compiling" = "xno"; then
- AC_CHECK_FILE([$default_docbook/manpages/docbook.xsl],
- [dbroot=$default_docbook],
- [dbroot="no"])
diff --git a/patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-libxml2.diff b/patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-libxml2.diff
deleted file mode 100644
index b5b3c61..0000000
--- a/patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-libxml2.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Subject: [PATCH] use pkg-config for libxml2 detection
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-
-When cross compiling, the current test incorrectly picks up the libxml2
-from the development host. Use pkg-config in order to do it right.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- configure.ac | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-Index: elektra-0.7.0-r1618/configure.ac
-===================================================================
---- elektra-0.7.0-r1618.orig/configure.ac
-+++ elektra-0.7.0-r1618/configure.ac
-@@ -435,11 +435,19 @@ fi
- privatelibs=""
-
- # Check for libxml (Allow compilation of libelektratools)
--AM_PATH_XML2(, [elektra_have_xml="yes"], [elektra_have_xml="no"])
--AM_CONDITIONAL(HAVE_XML, [test x$elektra_have_xml = xyes])
--if test "x$elektra_have_xml" = "xyes"; then
-+REQUIRES_LIBXML2="libxml2 >= 2.6.0"
-+AC_SUBST(REQUIRES_LIBXML2)
-+PKG_CHECK_MODULES([libxml2],
-+ [${REQUIRES_LIBXML2}],
-+ [HAVE_XML=yes],
-+ [HAVE_XML=no]
-+)
-+AC_SUBST(libxml2_CFLAGS)
-+AC_SUBST(libxml2_LIBS)
-+AM_CONDITIONAL([HAVE_XML],[test "$HAVE_XML" = "yes"])
-+if test $HAVE_XML; then
- elektratools=libelektratools
-- privatelibs=$privatelibs" -lxml2"
-+ privatelibs=$privatelibs"$libxml2_LIBS"
- fi
-
- AC_SUBST(elektratools)
diff --git a/patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-static-libs.diff b/patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-static-libs.diff
deleted file mode 100644
index 9a6b7b3..0000000
--- a/patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-static-libs.diff
+++ /dev/null
@@ -1,105 +0,0 @@
-Subject: [PATCH] fix --enable-static
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-
-Build static libs only when --enable-static was given.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- configure.ac | 12 +++++++-----
- src/kdb/Makefile.am | 10 +++++++++-
- src/preload/Makefile.am | 10 +++++++++-
- 3 files changed, 25 insertions(+), 7 deletions(-)
-
-Index: elektra-0.7.0-r1618/configure.ac
-===================================================================
---- elektra-0.7.0-r1618.orig/configure.ac
-+++ elektra-0.7.0-r1618/configure.ac
-@@ -59,7 +59,7 @@ esac
- # Disable libtool static lib
- #AC_DISABLE_STATIC
-
--
-+AM_CONDITIONAL([ENABLE_STATIC],[test x$enable_static = xyes])
-
-
-
-@@ -560,10 +560,12 @@ ALLOW_BACKEND(daemon, [test x$elektra_uc
-
- AC_SUBST(BACKENDS)
-
--backend_static_libs=
--for backend in $BACKENDS; do
-- backend_static_libs="$backend_static_libs ../backends/${backend}/libelektra-${backend}.a"
--done
-+if test x$enable_static = xyes; then
-+ backend_static_libs=
-+ for backend in $BACKENDS; do
-+ backend_static_libs="$backend_static_libs ../backends/${backend}/libelektra-${backend}.a"
-+ done
-+fi
-
- AC_SUBST(privatelibs)
- AC_SUBST(backend_static_libs)
-Index: elektra-0.7.0-r1618/src/kdb/Makefile.am
-===================================================================
---- elektra-0.7.0-r1618.orig/src/kdb/Makefile.am
-+++ elektra-0.7.0-r1618/src/kdb/Makefile.am
-@@ -5,17 +5,25 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/includ
-
- kdb_source = kdb-tool.c kdb-tool.h help.c BSDgetopt.c BSDgetopt.h ../include/kdb.h ../include/kdbloader.h ../include/kdbtools.h
-
--bin_PROGRAMS = kdb kdb_static
-+if ENABLE_STATIC
-+KDB_STATIC=kdb_static
-+else
-+KDB_STATIC=
-+endif
-+
-+bin_PROGRAMS = kdb $(KDB_STATIC)
- kdb_SOURCES = $(kdb_source)
- kdb_LDADD = ../libelektra/libelektra.la $(LIBLTDL) $(LIBICONV)
- kdb_CFLAGS = $(COPTFLAGS) $(CDBGFLAGS)
-
-+if ENABLE_STATIC
- kdb_static_SOURCES = $(kdb_source)
- kdb_static_LDADD = $(privatelibs) ../libelektra/libelektra.a $(LIBICONV)
- kdb_static_CFLAGS = -DELEKTRA_STATIC $(COPTFLAGS) $(CDBGFLAGS)
-
- ../libelektra/libelektra.a:
- cd ../libelektra && $(MAKE) libelektra.a
-+endif
-
- clean-local:
- rm -f *.gcno *.gcda *.gcno
-Index: elektra-0.7.0-r1618/src/preload/Makefile.am
-===================================================================
---- elektra-0.7.0-r1618.orig/src/preload/Makefile.am
-+++ elektra-0.7.0-r1618/src/preload/Makefile.am
-@@ -3,17 +3,25 @@ AM_CPPFLAGS = -DDATADIR=\"$(datadir)\"
-
- preload_source = preload.c ../include/kdb.h
-
--bin_PROGRAMS = preload preload_static
-+if ENABLE_STATIC
-+PRELOAD_STATIC=preload_static
-+else
-+PRELOAD_STATIC=
-+endif
-+
-+bin_PROGRAMS = preload $(PRELOAD_STATIC)
- preload_SOURCES = $(preload_source)
- preload_LDADD = ../libelektra/libelektra.la $(LIBLTDL) $(LIBICONV)
- preload_CFLAGS = $(COPTFLAGS) $(CDBGFLAGS)
-
-+if ENABLE_STATIC
- preload_static_SOURCES = $(preload_source)
- preload_static_LDADD = $(privatelibs) ../libelektra/libelektra.a $(LIBICONV)
- preload_static_CFLAGS = -DELEKTRA_STATIC $(COPTFLAGS) $(CDBGFLAGS)
-
- ../libelektra/libelektra.a:
- cd ../libelektra && $(MAKE) libelektra.a
-+endif
-
- clean-local:
- rm -f *.gcno *.gcda *.gcno
diff --git a/patches/elektra-0.7.0-r1618/series b/patches/elektra-0.7.0-r1618/series
deleted file mode 100644
index e8f3fb1..0000000
--- a/patches/elektra-0.7.0-r1618/series
+++ /dev/null
@@ -1,4 +0,0 @@
-elektra-0.7.0rc5-file-existence.diff
-elektra-0.7.0rc5-libxml2.diff
-elektra-0.7.0rc5-static-libs.diff
-elektra-0.7.0-r1618-ini-debug.diff
diff --git a/rules/elektra.in b/rules/elektra.in
deleted file mode 100644
index 7b4373f..0000000
--- a/rules/elektra.in
+++ /dev/null
@@ -1,110 +0,0 @@
-## SECTION=system_libraries
-menuconfig ELEKTRA
- tristate
- depends on BROKEN
- prompt "elektra "
- select DB if ELEKTRA__BERKELEYDB
- help
- Elektra is a universal hierarchical configuration store, with related
- goals like GConf and the Windows Registry. It allows programs to read
- and save their configurations with a consistent API, and allows them to
- be aware of other applications' configurations, leveraging easy
- application integration. The whole point of it is to tie applications
- together, so that they can co-operate and share their user-preferences.
-
-if ELEKTRA
-
-config ELEKTRA__DEBUG
- bool
- prompt "enable debug support"
- help
- This option enables debug support for libelektra. You get much more
- output than with normal production systems when enabled.
-
-choice
- prompt "default backend "
- default ELEKTRA__DEFAULT_BACKEND_NONE
-
- config ELEKTRA__DEFAULT_BACKEND_NONE
- bool
- prompt "none "
-
- config ELEKTRA__DEFAULT_BACKEND_FILESYS
- bool
- depends on ELEKTRA__FILESYS
- prompt "filesys "
-
- config ELEKTRA__DEFAULT_BACKEND_HOSTS
- bool
- depends on ELEKTRA__HOSTS
- prompt "hosts "
-
- config ELEKTRA__DEFAULT_BACKEND_INI
- bool
- depends on ELEKTRA__INI
- prompt "ini "
-
- config ELEKTRA__DEFAULT_BACKEND_BERKELEYDB
- bool
- depends on ELEKTRA__BERKELEYDB
- prompt "berkeleydb"
-
- config ELEKTRA__DEFAULT_BACKEND_FSTAB
- bool
- depends on ELEKTRA__FSTAB
- prompt "fstab "
-
- config ELEKTRA__DEFAULT_BACKEND_PASSWD
- bool
- depends on ELEKTRA__PASSWD
- prompt "passwd "
-
- config ELEKTRA__DEFAULT_BACKEND_DAEMON
- bool
- depends on ELEKTRA__DAEMON
- prompt "daemon "
-endchoice
-
-menu "backends "
-
- config ELEKTRA__FILESYS
- bool
- prompt "filesys backend"
-
- config ELEKTRA__HOSTS
- bool
- prompt "hosts backend"
-
- config ELEKTRA__INI
- bool
- prompt "ini backend"
-
- config ELEKTRA__BERKELEYDB
- bool
- depends on BROKEN
- prompt "berkeleydb backend"
-
- config ELEKTRA__FSTAB
- bool
- depends on BROKEN
- prompt "fstab backend"
-
- config ELEKTRA__PASSWD
- bool
- prompt "passwd backend"
-
- config ELEKTRA__DAEMON
- bool
- prompt "daemon backend"
-
-endmenu
-
-menu "language bindings "
-
- config ELEKTRA__CPP
- bool
- prompt "c++ bindings"
-
-endmenu
-
-endif
diff --git a/rules/elektra.make b/rules/elektra.make
deleted file mode 100644
index b393917..0000000
--- a/rules/elektra.make
+++ /dev/null
@@ -1,271 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2008 by Robert Schwebel <r.schwebel@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_ELEKTRA) += elektra
-
-#
-# Paths and names
-#
-ELEKTRA_VERSION := 0.7.0-r1618
-ELEKTRA_MD5 :=
-ELEKTRA := elektra-$(ELEKTRA_VERSION)
-ELEKTRA_SUFFIX := tar.gz
-ELEKTRA_URL := http://www.markus-raab.org/ftp/$(ELEKTRA).$(ELEKTRA_SUFFIX) \
- http://www.pengutronix.de/software/ptxdist/temporary-src/$(ELEKTRA).$(ELEKTRA_SUFFIX)
-ELEKTRA_SOURCE := $(SRCDIR)/$(ELEKTRA).$(ELEKTRA_SUFFIX)
-ELEKTRA_DIR := $(BUILDDIR)/$(ELEKTRA)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-$(ELEKTRA_SOURCE):
- @$(call targetinfo)
- @$(call get, ELEKTRA)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-ELEKTRA_ENV := \
- $(CROSS_ENV)
-
-#
-# FIXME:
-#
-# elektra does not try to link against libltdl if not built with
-# --enable-ltdl-install. The right solution is probably to build an external
-# libltdl and select it from kconfig.
-#
-# We install libltdl here, although it may collide with other packages.
-#
-
-#
-# autoconf
-#
-ELEKTRA_AUTOCONF := \
- $(CROSS_AUTOCONF_USR) \
- --disable-experimental \
- --disable-valgrind-tests \
- --disable-gcov \
- --enable-shared \
- --disable-static \
- --disable-fast-install \
- --without-libiconv-prefix \
- --disable-rpath \
- --disable-xmltest \
- --disable-gconf \
- --disable-python \
- --enable-ltdl-install
-
-ifdef PTXCONF_ELEKTRA__DEBUG
-ELEKTRA_AUTOCONF += --enable-debug
-else
-#ELEKTRA_AUTOCONF += --disable-debug
-endif
-
-ifdef PTXCONF_ICONV
-ELEKTRA_AUTOCONF += --enable-iconv
-else
-ELEKTRA_AUTOCONF += --disable-iconv
-endif
-
-#
-# backends
-#
-
-ifdef PTXCONF_ELEKTRA__FILESYS
-ELEKTRA_AUTOCONF += --enable-filesys
-else
-ELEKTRA_AUTOCONF += --disable-filesys
-endif
-ifdef PTXCONF_ELEKTRA__HOSTS
-ELEKTRA_AUTOCONF += --enable-hosts
-else
-ELEKTRA_AUTOCONF += --disable-hosts
-endif
-ifdef PTXCONF_ELEKTRA__INI
-ELEKTRA_AUTOCONF += --enable-ini
-else
-ELEKTRA_AUTOCONF += --disable-ini
-endif
-ifdef PTXCONF_ELEKTRA__BERKELEYDB
-ELEKTRA_AUTOCONF += --enable-berkeleydb
-else
-ELEKTRA_AUTOCONF += --disable-berkeleydb
-endif
-ifdef PTXCONF_ELEKTRA__FSTAB
-ELEKTRA_AUTOCONF += --enable-fstab
-else
-ELEKTRA_AUTOCONF += --disable-fstab
-endif
-ifdef PTXCONF_ELEKTRA__PASSWD
-ELEKTRA_AUTOCONF += --enable-passwd
-else
-ELEKTRA_AUTOCONF += --disable-passwd
-endif
-ifdef PTXCONF_ELEKTRA__DAEMON
-ELEKTRA_AUTOCONF += --enable-daemon
-else
-ELEKTRA_AUTOCONF += --disable-daemon
-endif
-ifdef PTXCONF_ELEKTRA__CPP
-ELEKTRA_AUTOCONF += --enable-cpp
-else
-ELEKTRA_AUTOCONF += --disable-cpp
-endif
-
-# --with-ulibdir=ULIBDIR> Set the path for usr lib.
-# --with-backenddir=<path where backend libraries are>
-# Set the path for backend libraries.
-# [LIBDIR/elektra@]
-# --with-hlvl-backenddir=<path where high level backend libraries are>
-# Set the path for high level backend libraries.
-# [ULIBDIR/elektra]
-# --with-docdir=<path where doc will be installed>
-# Set the path for documentation.
-# [DATADIR/doc/elektra]
-# --with-develdocdir=<path where elektra-api doc will be installed>
-# Set the path for elektra api documentation.
-# [DATADIR/doc/elektra-devel]
-# --with-docbook=<path to docbook.xsl>
-# Set path to docbook.xsl used for generate manpage.
-# [/usr/share/sgml/docbook/xsl-stylesheets]
-# --with-kdbschemadir=<relative path to kdb schema>
-# Set the path for elektra.xsd. DATADIR will be
-# prefixed. [/sgml/elektra-$PACKAGE_VERSION]
-# --with-default-backend=<backend>
-# Set backend elektra will be linked to. [filesys]
-# --with-default-dbackend=<daemon backend>
-# Set the default backend for the kdbd daemon to use.
-# [berkeleydb]
-# --with-xml-prefix=PFX Prefix where libxml is installed (optional)
-# --with-xml-exec-prefix=PFX Exec prefix where libxml is installed (optional)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/elektra.compile:
- @$(call targetinfo)
- cd $(ELEKTRA_DIR) && \
- $(ELEKTRA_PATH) $(MAKE) $(PARALLELMFLAGS)
- cd $(ELEKTRA_DIR)/examples && \
- $(ELEKTRA_PATH) $(MAKE) check $(PARALLELMFLAGS)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/elektra.targetinstall:
- @$(call targetinfo)
-
- @$(call install_init, elektra)
- @$(call install_fixup, elektra,PRIORITY,optional)
- @$(call install_fixup, elektra,SECTION,base)
- @$(call install_fixup, elektra,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de> <your@email.please>")
- @$(call install_fixup, elektra,DESCRIPTION,missing)
-
- @$(call install_copy, elektra, 0, 0, 0755, $(ELEKTRA_DIR)/src/kdb/kdb, /usr/bin/kdb)
- @$(call install_copy, elektra, 0, 0, 0755, $(ELEKTRA_DIR)/src/preload/preload, /usr/bin/preload)
-
- @$(call install_lib, elektra, 0, 0, 0644, libelektra)
-
-# FIXME: libelektratools is only available if we have xml support
-# @$(call install_lib, elektra, 0, 0, 0644, libelektratools)
-
-ifdef PTXCONF_ELEKTRA__CPP
- @$(call install_lib, elektra, 0, 0, 0644, libelektra-cpp)
-endif
-ifdef PTXCONF_ELEKTRA__FILESYS
- @$(call install_copy, elektra, 0, 0, 0644, \
- $(ELEKTRA_DIR)/src/backends/filesys/.libs/libelektra-filesys.so, \
- /usr/lib/elektra/libelektra-filesys.so)
-endif
-ifdef PTXCONF_ELEKTRA__HOSTS
- @$(call install_copy, elektra, 0, 0, 0644, \
- $(ELEKTRA_DIR)/src/backends/hosts/.libs/libelektra-hosts.so, \
- /usr/lib/elektra/libelektra-hosts.so)
-endif
-ifdef PTXCONF_ELEKTRA__INI
- @$(call install_copy, elektra, 0, 0, 0644, \
- $(ELEKTRA_DIR)/src/backends/ini/.libs/libelektra-ini.so, \
- /usr/lib/elektra/libelektra-ini.so)
-endif
-ifdef PTXCONF_ELEKTRA__BERKELEYDB
- @$(call install_copy, elektra, 0, 0, 0644, \
- $(ELEKTRA_DIR)/src/backends/berkeleydb/.libs/libelektra-berkeleydb.so, \
- /usr/lib/elektra/libelektra-berkeleydb.so)
-endif
-ifdef PTXCONF_ELEKTRA__FSTAB
- @$(call install_copy, elektra, 0, 0, 0644, \
- $(ELEKTRA_DIR)/src/backends/fstab/.libs/libelektra-fstab.so, \
- /usr/lib/elektra/libelektra-fstab.so)
-endif
-ifdef PTXCONF_ELEKTRA__PASSWD
- @$(call install_copy, elektra, 0, 0, 0644, \
- $(ELEKTRA_DIR)/src/backends/passwd/.libs/libelektra-passwd.so, \
- /usr/lib/elektra/libelektra-passwd.so)
-endif
-ifdef PTXCONF_ELEKTRA__DAEMON
- @$(call install_copy, elektra, 0, 0, 0644, \
- $(ELEKTRA_DIR)/src/backends/daemon/.libs/libelektra-daemon.so, \
- /usr/lib/elektra/libelektra-daemon.so)
- @$(call install_copy, elektra, 0, 0, 0755, $(ELEKTRA_DIR)/src/backends/daemon/kdbd, /usr/sbin/kdbd)
-endif
-
- # make link for default backend
-ifdef PTXCONF_ELEKTRA__DEFAULT_BACKEND_FILESYS
- @$(call install_link, elektra, \
- libelektra-filesys.so, \
- /usr/lib/elektra/libelektra-default.so)
-endif
-ifdef PTXCONF_ELEKTRA__DEFAULT_BACKEND_HOSTS
- @$(call install_link, elektra, \
- libelektra-hosts.so, \
- /usr/lib/elektra/libelektra-default.so)
-endif
-ifdef PTXCONF_ELEKTRA__DEFAULT_BACKEND_INI
- @$(call install_link, elektra, \
- libelektra-ini.so, \
- /usr/lib/elektra/libelektra-default.so)
-endif
-ifdef PTXCONF_ELEKTRA__DEFAULT_BACKEND_BERKELEYDB
- @$(call install_link, elektra, \
- libelektra-berkeleydb.so, \
- /usr/lib/elektra/libelektra-default.so)
-endif
-ifdef PTXCONF_ELEKTRA__DEFAULT_BACKEND_FSTAB
- @$(call install_link, elektra, \
- libelektra-fstab.so, \
- /usr/lib/elektra/libelektra-default.so)
-endif
-ifdef PTXCONF_ELEKTRA__DEFAULT_BACKEND_PASSWD
- @$(call install_link, elektra, \
- libelektra-passwd.so, \
- /usr/lib/elektra/libelektra-default.so)
-endif
-ifdef PTXCONF_ELEKTRA__DEFAULT_BACKEND_DAEMON
- @$(call install_link, elektra, \
- libelektra-daemon.so, \
- /usr/lib/elektra/libelektra-default.so)
-endif
- # FIXME: see note above
- @$(call install_lib, elektra, 0, 0, 0644, libltdl)
-
- @$(call install_finish, elektra)
-
- @$(call touch)
-
-# vim: syntax=make
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 20/28] etherwake: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (17 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 19/28] elektra: remove orphaned package Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 21/28] fakeroot: " Robert Schwebel
` (7 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
[-- Attachment #1: Type: text/plain, Size: 25747 bytes --]
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
.../0001-etherwake_1.09-1.diff.patch | 477 ++++++++++++++++++++
patches/etherwake-1.09.orig/etherwake_1.09-1.diff | 411 -----------------
patches/etherwake-1.09.orig/series | 1 -
3 files changed, 477 insertions(+), 412 deletions(-)
create mode 100644 patches/etherwake-1.09.orig/0001-etherwake_1.09-1.diff.patch
delete mode 100644 patches/etherwake-1.09.orig/etherwake_1.09-1.diff
delete mode 100644 patches/etherwake-1.09.orig/series
diff --git a/patches/etherwake-1.09.orig/0001-etherwake_1.09-1.diff.patch b/patches/etherwake-1.09.orig/0001-etherwake_1.09-1.diff.patch
new file mode 100644
index 0000000..386578f
--- /dev/null
+++ b/patches/etherwake-1.09.orig/0001-etherwake_1.09-1.diff.patch
@@ -0,0 +1,477 @@
+From 9c38c5d58c21710c4ebe988759b155ea16739df1 Mon Sep 17 00:00:00 2001
+From: unknown author <unknown.author@example.com>
+Date: Sat, 29 Oct 2011 19:17:46 +0200
+Subject: [PATCH] etherwake_1.09-1.diff
+
+---
+ Makefile | 12 +++++++
+ debian/changelog | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ debian/control | 18 +++++++++++
+ debian/copyright | 12 +++++++
+ debian/dirs | 1 +
+ debian/manpages | 1 +
+ debian/postinst | 47 +++++++++++++++++++++++++++++
+ debian/postrm | 36 ++++++++++++++++++++++
+ debian/preinst | 42 ++++++++++++++++++++++++++
+ debian/prerm | 37 +++++++++++++++++++++++
+ debian/rules | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 11 files changed, 378 insertions(+), 0 deletions(-)
+ create mode 100644 Makefile
+ create mode 100644 debian/changelog
+ create mode 100644 debian/control
+ create mode 100644 debian/copyright
+ create mode 100644 debian/dirs
+ create mode 100644 debian/manpages
+ create mode 100644 debian/postinst
+ create mode 100644 debian/postrm
+ create mode 100644 debian/preinst
+ create mode 100644 debian/prerm
+ create mode 100644 debian/rules
+
+diff --git a/Makefile b/Makefile
+new file mode 100644
+index 0000000..671514d
+--- /dev/null
++++ b/Makefile
+@@ -0,0 +1,12 @@
++CFLAGS = -Wall
++INSTALL = /usr/bin/install
++CC = gcc
++
++all:
++ $(CC) $(CFLAGS) -o etherwake ether-wake.c
++
++clean:
++ rm etherwake
++
++install:
++ $(INSTALL) etherwake $(DESTDIR)/usr/sbin
+diff --git a/debian/changelog b/debian/changelog
+new file mode 100644
+index 0000000..8d7053d
+--- /dev/null
++++ b/debian/changelog
+@@ -0,0 +1,86 @@
++etherwake (1.09-1) unstable; urgency=low
++
++ * New Upstream
++
++ -- Alain Schroeder <alain@debian.org> Sun, 10 Jul 2005 20:53:02 +0200
++
++etherwake (1.08-1) unstable; urgency=low
++
++ * New Upstream.
++ * Beautified Help Texts.
++ * Cleans (PF_INET,SOCK_PACKET) problems (Closes: #171051)
++ * Renamed ether-wake.8 to etherwake.8 (Closes: #185134)
++ * Revisioned the manpage (Closes: #179290)
++ * Cleaned my helptext from multiline strings, Thanks to Daniel Schepler
++ <schepler@math.berkeley.edu> (Closes: #194909)
++ * Upped Standart Version to 3.5.10.0
++
++ -- Alain Schroeder <alain@debian.org> Fri, 6 Jun 2003 21:02:11 +0200
++
++etherwake (1.06-2) unstable; urgency=low
++
++ * Reamped description to explain what WOL is (Closes: #135420).
++ * Reamped manpage a bit.
++ * Upped Standart Version to 3.5.6.0.
++
++ -- Alain Schroeder <alain@debian.org> Sun, 24 Feb 2002 00:45:07 +0100
++
++etherwake (1.06-1) unstable; urgency=low
++
++ * New Upstream.
++
++ -- Alain Schroeder <alain@parkautomat.net> Fri, 15 Feb 2002 19:15:07 +0100
++
++etherwake (1.05-6) unstable; urgency=low
++
++ * Fix etherwake to use sockets correctly - removes "uses obsolete
++ (PF_INET,SOCK_PACKET)" message. (Closes: #111681)
++
++ -- Alain Schroeder <alain@debian.org> Sat, 22 Dec 2001 21:51:06 +0100
++
++etherwake (1.05-5) unstable; urgency=low
++
++ * Improve description again. (Closes: #124604)
++
++ -- Alain Schroeder <alain@debian.org> Sat, 22 Dec 2001 20:22:16 +0100
++
++etherwake (1.05-4) unstable; urgency=low
++
++ * Removed more typos in description. (Again thanks to Carlos Valdivia
++ Yag�e)
++
++ -- Alain Schroeder <alain@debian.org> Thu, 10 May 2001 15:55:48 +0200
++
++etherwake (1.05-3) unstable; urgency=low
++
++ * Removed typo in description. (Closes: #95946)
++
++ -- Alain Schroeder <alain@debian.org> Tue, 1 May 2001 21:14:41 +0200
++
++etherwake (1.05-2) unstable; urgency=low
++
++ * Upload with diff. It was incidentally uploaded as a native
++ Debian package.
++ * Fixed issues with new libc. The old sys/socket.h did not include
++ bits/uio.h, which it does now. This unfortunately causes that
++ ether-wake wasn�t build anymore. I just commented specific part as
++ a quick fix for now. It seems that everything works even with the old
++ libc, closes #87014.
++
++ -- Alain Schroeder <alain@debian.org> Fri, 23 Feb 2001 00:27:02 +0100
++
++etherwake (1.05-1) unstable; urgency=low
++
++ * New upstream (help was added).
++ * Modified manpage to reflect upstream changes.
++ * Changed binary name to original.
++
++ -- Alain Schroeder <alain@debian.org> Tue, 20 Feb 2001 11:39:03 +0100
++
++etherwake (1.03-1) unstable; urgency=low
++
++ * Added a manpage.
++ * Added a Makefile.
++ * Initial Release.
++
++ -- Alain Schroeder <alain@debian.org> Thu, 7 Dec 2000 10:00:24 +0100
+diff --git a/debian/control b/debian/control
+new file mode 100644
+index 0000000..51677a8
+--- /dev/null
++++ b/debian/control
+@@ -0,0 +1,18 @@
++Source: etherwake
++Section: net
++Priority: optional
++Maintainer: Alain Schroeder <alain@debian.org>
++Build-Depends: debhelper (>> 3.0)
++Standards-Version: 3.6.2
++
++Package: etherwake
++Architecture: any
++Depends: ${shlibs:Depends}
++Description: A little tool to send magic Wake-on-LAN packets
++ You can wake up WOL compliant Computers which have been powered down to
++ sleep mode or start WOL compliant Computers with a BIOS feature.
++ .
++ WOL is an abbreviation for Wake-on-LAN. It is a standard that allows you
++ to turn on a computer from another location over a network connection.
++ .
++ etherwake also supports WOL passwords.
+diff --git a/debian/copyright b/debian/copyright
+new file mode 100644
+index 0000000..3d5b08c
+--- /dev/null
++++ b/debian/copyright
+@@ -0,0 +1,12 @@
++This package was debianized by Alain Schroeder <alain@debian.org> on
++Thu, 7 Dec 2000 10:00:24 +0100.
++
++It was downloaded from http://www.scyld.com/expert/wake-on-lan.html
++
++Upstream Author: Donald Becker <becker@scyld.com>
++
++Copyright:
++
++ You are free to distribute this software under the terms of the GNU
++ General Public License. The full text of this license can be found
++ in the file /usr/share/common-licenses/GPL.
+diff --git a/debian/dirs b/debian/dirs
+new file mode 100644
+index 0000000..236670a
+--- /dev/null
++++ b/debian/dirs
+@@ -0,0 +1 @@
++usr/sbin
+diff --git a/debian/manpages b/debian/manpages
+new file mode 100644
+index 0000000..2b9d71b
+--- /dev/null
++++ b/debian/manpages
+@@ -0,0 +1 @@
++etherwake.8
+diff --git a/debian/postinst b/debian/postinst
+new file mode 100644
+index 0000000..128be98
+--- /dev/null
++++ b/debian/postinst
+@@ -0,0 +1,47 @@
++#! /bin/sh
++# postinst script for etherwake
++#
++# see: dh_installdeb(1)
++
++set -e
++
++# summary of how this script can be called:
++# * <postinst> `configure' <most-recently-configured-version>
++# * <old-postinst> `abort-upgrade' <new version>
++# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
++# <new-version>
++# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
++# <failed-install-package> <version> `removing'
++# <conflicting-package> <version>
++# for details, see /usr/share/doc/packaging-manual/
++#
++# quoting from the policy:
++# Any necessary prompting should almost always be confined to the
++# post-installation script, and should be protected with a conditional
++# so that unnecessary prompting doesn't happen if a package's
++# installation fails and the `postinst' is called with `abort-upgrade',
++# `abort-remove' or `abort-deconfigure'.
++
++case "$1" in
++ configure)
++
++ ;;
++
++ abort-upgrade|abort-remove|abort-deconfigure)
++
++ ;;
++
++ *)
++ echo "postinst called with unknown argument \`$1'" >&2
++ exit 0
++ ;;
++esac
++
++# dh_installdeb will replace this with shell code automatically
++# generated by other debhelper scripts.
++
++#DEBHELPER#
++
++exit 0
++
++
+diff --git a/debian/postrm b/debian/postrm
+new file mode 100644
+index 0000000..a0a0337
+--- /dev/null
++++ b/debian/postrm
+@@ -0,0 +1,36 @@
++#! /bin/sh
++# postrm script for etherwake
++#
++# see: dh_installdeb(1)
++
++set -e
++
++# summary of how this script can be called:
++# * <postrm> `remove'
++# * <postrm> `purge'
++# * <old-postrm> `upgrade' <new-version>
++# * <new-postrm> `failed-upgrade' <old-version>
++# * <new-postrm> `abort-install'
++# * <new-postrm> `abort-install' <old-version>
++# * <new-postrm> `abort-upgrade' <old-version>
++# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
++# for details, see /usr/share/doc/packaging-manual/
++
++case "$1" in
++ purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
++
++
++ ;;
++
++ *)
++ echo "postrm called with unknown argument \`$1'" >&2
++ exit 0
++
++esac
++
++# dh_installdeb will replace this with shell code automatically
++# generated by other debhelper scripts.
++
++#DEBHELPER#
++
++
+diff --git a/debian/preinst b/debian/preinst
+new file mode 100644
+index 0000000..b3126b8
+--- /dev/null
++++ b/debian/preinst
+@@ -0,0 +1,42 @@
++#! /bin/sh
++# preinst script for etherwake
++#
++# see: dh_installdeb(1)
++
++set -e
++
++# summary of how this script can be called:
++# * <new-preinst> `install'
++# * <new-preinst> `install' <old-version>
++# * <new-preinst> `upgrade' <old-version>
++# * <old-preinst> `abort-upgrade' <new-version>
++#
++# For details see /usr/share/doc/packaging-manual/
++
++case "$1" in
++ install|upgrade)
++# if [ "$1" = "upgrade" ]
++# then
++# start-stop-daemon --stop --quiet --oknodo \
++# --pidfile /var/run/etherwake.pid \
++# --exec /usr/sbin/etherwake 2>/dev/null || true
++# fi
++ ;;
++
++ abort-upgrade)
++ ;;
++
++ *)
++ echo "preinst called with unknown argument \`$1'" >&2
++ exit 0
++ ;;
++esac
++
++# dh_installdeb will replace this with shell code automatically
++# generated by other debhelper scripts.
++
++#DEBHELPER#
++
++exit 0
++
++
+diff --git a/debian/prerm b/debian/prerm
+new file mode 100644
+index 0000000..0862b02
+--- /dev/null
++++ b/debian/prerm
+@@ -0,0 +1,37 @@
++#! /bin/sh
++# prerm script for etherwake
++#
++# see: dh_installdeb(1)
++
++set -e
++
++# summary of how this script can be called:
++# * <prerm> `remove'
++# * <old-prerm> `upgrade' <new-version>
++# * <new-prerm> `failed-upgrade' <old-version>
++# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
++# * <deconfigured's-prerm> `deconfigure' `in-favour'
++# <package-being-installed> <version> `removing'
++# <conflicting-package> <version>
++# for details, see /usr/share/doc/packaging-manual/
++
++case "$1" in
++ remove|upgrade|deconfigure)
++# install-info --quiet --remove /usr/info/etherwake.info.gz
++ ;;
++ failed-upgrade)
++ ;;
++ *)
++ echo "prerm called with unknown argument \`$1'" >&2
++ exit 0
++ ;;
++esac
++
++# dh_installdeb will replace this with shell code automatically
++# generated by other debhelper scripts.
++
++#DEBHELPER#
++
++exit 0
++
++
+diff --git a/debian/rules b/debian/rules
+new file mode 100644
+index 0000000..f90bc3f
+--- /dev/null
++++ b/debian/rules
+@@ -0,0 +1,86 @@
++#!/usr/bin/make -f
++# Sample debian/rules that uses debhelper.
++# GNU copyright 1997 to 1999 by Joey Hess.
++
++# Uncomment this to turn on verbose mode.
++export DH_VERBOSE=1
++
++# This is the debhelper compatability version to use.
++export DH_COMPAT=2
++
++configure: configure-stamp
++configure-stamp:
++ dh_testdir
++ # Add here commands to configure the package.
++
++
++ touch configure-stamp
++
++build: configure-stamp build-stamp
++build-stamp:
++ dh_testdir
++
++ # Add here commands to compile the package.
++ $(MAKE)
++ #/usr/bin/docbook-to-man debian/etherwake.sgml > etherwake.1
++
++ touch build-stamp
++
++clean:
++ dh_testdir
++ dh_testroot
++ rm -f build-stamp configure-stamp
++
++ # Add here commands to clean up after the build process.
++ -$(MAKE) clean
++
++ dh_clean
++
++install: build
++ dh_testdir
++ dh_testroot
++ dh_clean -k
++ dh_installdirs
++# Fix below...
++# mkdir -p debian/tmp/usr/sbin
++
++ # Add here commands to install the package into debian/tmp.
++ $(MAKE) install DESTDIR=`pwd`/debian/etherwake
++
++# Build architecture-independent files here.
++binary-indep: build install
++# We have nothing to do by default.
++
++# Build architecture-dependent files here.
++binary-arch: build install
++# dh_testversion
++ dh_testdir
++ dh_testroot
++# dh_installdebconf
++ dh_installdocs
++ dh_installexamples
++ dh_installmenu
++# dh_installemacsen
++# dh_installpam
++# dh_installinit
++ dh_installcron
++ dh_installman
++ dh_installinfo
++# dh_undocumented
++ dh_installchangelogs
++ dh_link
++ dh_strip
++ dh_compress
++ dh_fixperms
++ # You may want to make some executables suid here.
++# dh_suidregister
++# dh_makeshlibs
++ dh_installdeb
++# dh_perl
++ dh_shlibdeps
++ dh_gencontrol
++ dh_md5sums
++ dh_builddeb
++
++binary: binary-indep binary-arch
++.PHONY: build clean binary-indep binary-arch binary install configure
+--
+1.7.7
+
diff --git a/patches/etherwake-1.09.orig/etherwake_1.09-1.diff b/patches/etherwake-1.09.orig/etherwake_1.09-1.diff
deleted file mode 100644
index f6d8d9d..0000000
--- a/patches/etherwake-1.09.orig/etherwake_1.09-1.diff
+++ /dev/null
@@ -1,411 +0,0 @@
---- etherwake-1.09.orig/Makefile
-+++ etherwake-1.09/Makefile
-@@ -0,0 +1,12 @@
-+CFLAGS = -Wall
-+INSTALL = /usr/bin/install
-+CC = gcc
-+
-+all:
-+ $(CC) $(CFLAGS) -o etherwake ether-wake.c
-+
-+clean:
-+ rm etherwake
-+
-+install:
-+ $(INSTALL) etherwake $(DESTDIR)/usr/sbin
---- etherwake-1.09.orig/debian/changelog
-+++ etherwake-1.09/debian/changelog
-@@ -0,0 +1,86 @@
-+etherwake (1.09-1) unstable; urgency=low
-+
-+ * New Upstream
-+
-+ -- Alain Schroeder <alain@debian.org> Sun, 10 Jul 2005 20:53:02 +0200
-+
-+etherwake (1.08-1) unstable; urgency=low
-+
-+ * New Upstream.
-+ * Beautified Help Texts.
-+ * Cleans (PF_INET,SOCK_PACKET) problems (Closes: #171051)
-+ * Renamed ether-wake.8 to etherwake.8 (Closes: #185134)
-+ * Revisioned the manpage (Closes: #179290)
-+ * Cleaned my helptext from multiline strings, Thanks to Daniel Schepler
-+ <schepler@math.berkeley.edu> (Closes: #194909)
-+ * Upped Standart Version to 3.5.10.0
-+
-+ -- Alain Schroeder <alain@debian.org> Fri, 6 Jun 2003 21:02:11 +0200
-+
-+etherwake (1.06-2) unstable; urgency=low
-+
-+ * Reamped description to explain what WOL is (Closes: #135420).
-+ * Reamped manpage a bit.
-+ * Upped Standart Version to 3.5.6.0.
-+
-+ -- Alain Schroeder <alain@debian.org> Sun, 24 Feb 2002 00:45:07 +0100
-+
-+etherwake (1.06-1) unstable; urgency=low
-+
-+ * New Upstream.
-+
-+ -- Alain Schroeder <alain@parkautomat.net> Fri, 15 Feb 2002 19:15:07 +0100
-+
-+etherwake (1.05-6) unstable; urgency=low
-+
-+ * Fix etherwake to use sockets correctly - removes "uses obsolete
-+ (PF_INET,SOCK_PACKET)" message. (Closes: #111681)
-+
-+ -- Alain Schroeder <alain@debian.org> Sat, 22 Dec 2001 21:51:06 +0100
-+
-+etherwake (1.05-5) unstable; urgency=low
-+
-+ * Improve description again. (Closes: #124604)
-+
-+ -- Alain Schroeder <alain@debian.org> Sat, 22 Dec 2001 20:22:16 +0100
-+
-+etherwake (1.05-4) unstable; urgency=low
-+
-+ * Removed more typos in description. (Again thanks to Carlos Valdivia
-+ Yag�e)
-+
-+ -- Alain Schroeder <alain@debian.org> Thu, 10 May 2001 15:55:48 +0200
-+
-+etherwake (1.05-3) unstable; urgency=low
-+
-+ * Removed typo in description. (Closes: #95946)
-+
-+ -- Alain Schroeder <alain@debian.org> Tue, 1 May 2001 21:14:41 +0200
-+
-+etherwake (1.05-2) unstable; urgency=low
-+
-+ * Upload with diff. It was incidentally uploaded as a native
-+ Debian package.
-+ * Fixed issues with new libc. The old sys/socket.h did not include
-+ bits/uio.h, which it does now. This unfortunately causes that
-+ ether-wake wasn�t build anymore. I just commented specific part as
-+ a quick fix for now. It seems that everything works even with the old
-+ libc, closes #87014.
-+
-+ -- Alain Schroeder <alain@debian.org> Fri, 23 Feb 2001 00:27:02 +0100
-+
-+etherwake (1.05-1) unstable; urgency=low
-+
-+ * New upstream (help was added).
-+ * Modified manpage to reflect upstream changes.
-+ * Changed binary name to original.
-+
-+ -- Alain Schroeder <alain@debian.org> Tue, 20 Feb 2001 11:39:03 +0100
-+
-+etherwake (1.03-1) unstable; urgency=low
-+
-+ * Added a manpage.
-+ * Added a Makefile.
-+ * Initial Release.
-+
-+ -- Alain Schroeder <alain@debian.org> Thu, 7 Dec 2000 10:00:24 +0100
---- etherwake-1.09.orig/debian/copyright
-+++ etherwake-1.09/debian/copyright
-@@ -0,0 +1,12 @@
-+This package was debianized by Alain Schroeder <alain@debian.org> on
-+Thu, 7 Dec 2000 10:00:24 +0100.
-+
-+It was downloaded from http://www.scyld.com/expert/wake-on-lan.html
-+
-+Upstream Author: Donald Becker <becker@scyld.com>
-+
-+Copyright:
-+
-+ You are free to distribute this software under the terms of the GNU
-+ General Public License. The full text of this license can be found
-+ in the file /usr/share/common-licenses/GPL.
---- etherwake-1.09.orig/debian/control
-+++ etherwake-1.09/debian/control
-@@ -0,0 +1,18 @@
-+Source: etherwake
-+Section: net
-+Priority: optional
-+Maintainer: Alain Schroeder <alain@debian.org>
-+Build-Depends: debhelper (>> 3.0)
-+Standards-Version: 3.6.2
-+
-+Package: etherwake
-+Architecture: any
-+Depends: ${shlibs:Depends}
-+Description: A little tool to send magic Wake-on-LAN packets
-+ You can wake up WOL compliant Computers which have been powered down to
-+ sleep mode or start WOL compliant Computers with a BIOS feature.
-+ .
-+ WOL is an abbreviation for Wake-on-LAN. It is a standard that allows you
-+ to turn on a computer from another location over a network connection.
-+ .
-+ etherwake also supports WOL passwords.
---- etherwake-1.09.orig/debian/dirs
-+++ etherwake-1.09/debian/dirs
-@@ -0,0 +1 @@
-+usr/sbin
---- etherwake-1.09.orig/debian/rules
-+++ etherwake-1.09/debian/rules
-@@ -0,0 +1,86 @@
-+#!/usr/bin/make -f
-+# Sample debian/rules that uses debhelper.
-+# GNU copyright 1997 to 1999 by Joey Hess.
-+
-+# Uncomment this to turn on verbose mode.
-+export DH_VERBOSE=1
-+
-+# This is the debhelper compatability version to use.
-+export DH_COMPAT=2
-+
-+configure: configure-stamp
-+configure-stamp:
-+ dh_testdir
-+ # Add here commands to configure the package.
-+
-+
-+ touch configure-stamp
-+
-+build: configure-stamp build-stamp
-+build-stamp:
-+ dh_testdir
-+
-+ # Add here commands to compile the package.
-+ $(MAKE)
-+ #/usr/bin/docbook-to-man debian/etherwake.sgml > etherwake.1
-+
-+ touch build-stamp
-+
-+clean:
-+ dh_testdir
-+ dh_testroot
-+ rm -f build-stamp configure-stamp
-+
-+ # Add here commands to clean up after the build process.
-+ -$(MAKE) clean
-+
-+ dh_clean
-+
-+install: build
-+ dh_testdir
-+ dh_testroot
-+ dh_clean -k
-+ dh_installdirs
-+# Fix below...
-+# mkdir -p debian/tmp/usr/sbin
-+
-+ # Add here commands to install the package into debian/tmp.
-+ $(MAKE) install DESTDIR=`pwd`/debian/etherwake
-+
-+# Build architecture-independent files here.
-+binary-indep: build install
-+# We have nothing to do by default.
-+
-+# Build architecture-dependent files here.
-+binary-arch: build install
-+# dh_testversion
-+ dh_testdir
-+ dh_testroot
-+# dh_installdebconf
-+ dh_installdocs
-+ dh_installexamples
-+ dh_installmenu
-+# dh_installemacsen
-+# dh_installpam
-+# dh_installinit
-+ dh_installcron
-+ dh_installman
-+ dh_installinfo
-+# dh_undocumented
-+ dh_installchangelogs
-+ dh_link
-+ dh_strip
-+ dh_compress
-+ dh_fixperms
-+ # You may want to make some executables suid here.
-+# dh_suidregister
-+# dh_makeshlibs
-+ dh_installdeb
-+# dh_perl
-+ dh_shlibdeps
-+ dh_gencontrol
-+ dh_md5sums
-+ dh_builddeb
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install configure
---- etherwake-1.09.orig/debian/postinst
-+++ etherwake-1.09/debian/postinst
-@@ -0,0 +1,47 @@
-+#! /bin/sh
-+# postinst script for etherwake
-+#
-+# see: dh_installdeb(1)
-+
-+set -e
-+
-+# summary of how this script can be called:
-+# * <postinst> `configure' <most-recently-configured-version>
-+# * <old-postinst> `abort-upgrade' <new version>
-+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-+# <new-version>
-+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-+# <failed-install-package> <version> `removing'
-+# <conflicting-package> <version>
-+# for details, see /usr/share/doc/packaging-manual/
-+#
-+# quoting from the policy:
-+# Any necessary prompting should almost always be confined to the
-+# post-installation script, and should be protected with a conditional
-+# so that unnecessary prompting doesn't happen if a package's
-+# installation fails and the `postinst' is called with `abort-upgrade',
-+# `abort-remove' or `abort-deconfigure'.
-+
-+case "$1" in
-+ configure)
-+
-+ ;;
-+
-+ abort-upgrade|abort-remove|abort-deconfigure)
-+
-+ ;;
-+
-+ *)
-+ echo "postinst called with unknown argument \`$1'" >&2
-+ exit 0
-+ ;;
-+esac
-+
-+# dh_installdeb will replace this with shell code automatically
-+# generated by other debhelper scripts.
-+
-+#DEBHELPER#
-+
-+exit 0
-+
-+
---- etherwake-1.09.orig/debian/postrm
-+++ etherwake-1.09/debian/postrm
-@@ -0,0 +1,36 @@
-+#! /bin/sh
-+# postrm script for etherwake
-+#
-+# see: dh_installdeb(1)
-+
-+set -e
-+
-+# summary of how this script can be called:
-+# * <postrm> `remove'
-+# * <postrm> `purge'
-+# * <old-postrm> `upgrade' <new-version>
-+# * <new-postrm> `failed-upgrade' <old-version>
-+# * <new-postrm> `abort-install'
-+# * <new-postrm> `abort-install' <old-version>
-+# * <new-postrm> `abort-upgrade' <old-version>
-+# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-+# for details, see /usr/share/doc/packaging-manual/
-+
-+case "$1" in
-+ purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-+
-+
-+ ;;
-+
-+ *)
-+ echo "postrm called with unknown argument \`$1'" >&2
-+ exit 0
-+
-+esac
-+
-+# dh_installdeb will replace this with shell code automatically
-+# generated by other debhelper scripts.
-+
-+#DEBHELPER#
-+
-+
---- etherwake-1.09.orig/debian/preinst
-+++ etherwake-1.09/debian/preinst
-@@ -0,0 +1,42 @@
-+#! /bin/sh
-+# preinst script for etherwake
-+#
-+# see: dh_installdeb(1)
-+
-+set -e
-+
-+# summary of how this script can be called:
-+# * <new-preinst> `install'
-+# * <new-preinst> `install' <old-version>
-+# * <new-preinst> `upgrade' <old-version>
-+# * <old-preinst> `abort-upgrade' <new-version>
-+#
-+# For details see /usr/share/doc/packaging-manual/
-+
-+case "$1" in
-+ install|upgrade)
-+# if [ "$1" = "upgrade" ]
-+# then
-+# start-stop-daemon --stop --quiet --oknodo \
-+# --pidfile /var/run/etherwake.pid \
-+# --exec /usr/sbin/etherwake 2>/dev/null || true
-+# fi
-+ ;;
-+
-+ abort-upgrade)
-+ ;;
-+
-+ *)
-+ echo "preinst called with unknown argument \`$1'" >&2
-+ exit 0
-+ ;;
-+esac
-+
-+# dh_installdeb will replace this with shell code automatically
-+# generated by other debhelper scripts.
-+
-+#DEBHELPER#
-+
-+exit 0
-+
-+
---- etherwake-1.09.orig/debian/manpages
-+++ etherwake-1.09/debian/manpages
-@@ -0,0 +1 @@
-+etherwake.8
---- etherwake-1.09.orig/debian/prerm
-+++ etherwake-1.09/debian/prerm
-@@ -0,0 +1,37 @@
-+#! /bin/sh
-+# prerm script for etherwake
-+#
-+# see: dh_installdeb(1)
-+
-+set -e
-+
-+# summary of how this script can be called:
-+# * <prerm> `remove'
-+# * <old-prerm> `upgrade' <new-version>
-+# * <new-prerm> `failed-upgrade' <old-version>
-+# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-+# * <deconfigured's-prerm> `deconfigure' `in-favour'
-+# <package-being-installed> <version> `removing'
-+# <conflicting-package> <version>
-+# for details, see /usr/share/doc/packaging-manual/
-+
-+case "$1" in
-+ remove|upgrade|deconfigure)
-+# install-info --quiet --remove /usr/info/etherwake.info.gz
-+ ;;
-+ failed-upgrade)
-+ ;;
-+ *)
-+ echo "prerm called with unknown argument \`$1'" >&2
-+ exit 0
-+ ;;
-+esac
-+
-+# dh_installdeb will replace this with shell code automatically
-+# generated by other debhelper scripts.
-+
-+#DEBHELPER#
-+
-+exit 0
-+
-+
diff --git a/patches/etherwake-1.09.orig/series b/patches/etherwake-1.09.orig/series
deleted file mode 100644
index 6827455..0000000
--- a/patches/etherwake-1.09.orig/series
+++ /dev/null
@@ -1 +0,0 @@
-etherwake_1.09-1.diff
--
1.7.7
[-- Attachment #2: Type: text/plain, Size: 48 bytes --]
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 21/28] fakeroot: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (18 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 20/28] etherwake: clean up patches Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 22/28] fbtest: " Robert Schwebel
` (6 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
...dd-FAKEROOT_SYSROOT-prefix-for-relocation.patch | 38 ++++++++++++++++++++
patches/fakeroot-1.14.4/add-sysroot-prefix.diff | 34 -----------------
patches/fakeroot-1.14.4/series | 1 -
3 files changed, 38 insertions(+), 35 deletions(-)
create mode 100644 patches/fakeroot-1.14.4/0001-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch
delete mode 100644 patches/fakeroot-1.14.4/add-sysroot-prefix.diff
delete mode 100644 patches/fakeroot-1.14.4/series
diff --git a/patches/fakeroot-1.14.4/0001-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch b/patches/fakeroot-1.14.4/0001-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch
new file mode 100644
index 0000000..eddc33e
--- /dev/null
+++ b/patches/fakeroot-1.14.4/0001-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch
@@ -0,0 +1,38 @@
+From ae801497625f2403507720ad5d1640756f6e8c17 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:16:53 +0100
+Subject: [PATCH] add FAKEROOT_SYSROOT prefix for relocation
+
+Prefix all paths with FAKEROOT_SYSROOT
+It will be replaced by the current sysroot.
+
+Not for upstream.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ scripts/fakeroot.in | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/fakeroot.in b/scripts/fakeroot.in
+index d4f888d..4c998c8 100755
+--- a/scripts/fakeroot.in
++++ b/scripts/fakeroot.in
+@@ -30,12 +30,12 @@ fatal ()
+ }
+
+ # strip /bin/fakeroot to find install prefix
+-FAKEROOT_PREFIX=@prefix@
+-FAKEROOT_BINDIR=@bindir@
++FAKEROOT_PREFIX="FAKEROOT_SYSROOT@prefix@"
++FAKEROOT_BINDIR="FAKEROOT_SYSROOT@bindir@"
+
+ USEABSLIBPATH=@LDPRELOADABS@
+ LIB=lib@fakeroot_transformed@@DLSUFFIX@
+-PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
++PATHS="FAKEROOT_SYSROOT@libdir@":${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
+ FAKED=${FAKEROOT_BINDIR}/@faked_transformed@
+
+ FAKED_MODE="unknown-is-root"
+--
+1.7.7
+
diff --git a/patches/fakeroot-1.14.4/add-sysroot-prefix.diff b/patches/fakeroot-1.14.4/add-sysroot-prefix.diff
deleted file mode 100644
index 3823956..0000000
--- a/patches/fakeroot-1.14.4/add-sysroot-prefix.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: add FAKEROOT_SYSROOT prefix for relocation
-
-Prefix all paths with FAKEROOT_SYSROOT
-It will be replaced by the current sysroot.
-
-Not for upstream.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- scripts/fakeroot.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-Index: b/scripts/fakeroot.in
-===================================================================
---- a/scripts/fakeroot.in
-+++ b/scripts/fakeroot.in
-@@ -30,12 +30,12 @@ fatal ()
- }
-
- # strip /bin/fakeroot to find install prefix
--FAKEROOT_PREFIX=@prefix@
--FAKEROOT_BINDIR=@bindir@
-+FAKEROOT_PREFIX="FAKEROOT_SYSROOT@prefix@"
-+FAKEROOT_BINDIR="FAKEROOT_SYSROOT@bindir@"
-
- USEABSLIBPATH=@LDPRELOADABS@
- LIB=lib@fakeroot_transformed@@DLSUFFIX@
--PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
-+PATHS="FAKEROOT_SYSROOT@libdir@":${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
- FAKED=${FAKEROOT_BINDIR}/@faked_transformed@
-
- FAKED_MODE="unknown-is-root"
diff --git a/patches/fakeroot-1.14.4/series b/patches/fakeroot-1.14.4/series
deleted file mode 100644
index 1ff956d..0000000
--- a/patches/fakeroot-1.14.4/series
+++ /dev/null
@@ -1 +0,0 @@
-add-sysroot-prefix.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 22/28] fbtest: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (19 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 21/28] fakeroot: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 23/28] font-alias: " Robert Schwebel
` (5 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
...re-generated-penguin.c-to-get-rid-of-this.patch | 659 ++++++++++++++++++++
.../fbtest-20041102-1/0002-Don-t-use-Werror.patch | 29 +
.../0003-Workaround-for-a-gcc-compiler-bug.patch | 47 ++
.../0004-remove-asm-page.h-use-sysconf.patch | 87 +++
.../0005-add-install-target.patch | 24 +
.../fbtest-20041102-1-add-make-install.diff | 20 -
.../fbtest-20041102-1-nowerror.diff | 22 -
.../fbtest-20041102-1-optimize-O2.diff | 41 --
.../fbtest-20041102-1-page_mask.diff | 83 ---
.../fbtest-20041102-1-penguin.diff | 652 -------------------
patches/fbtest-20041102-1/series | 5 -
11 files changed, 846 insertions(+), 823 deletions(-)
create mode 100644 patches/fbtest-20041102-1/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch
create mode 100644 patches/fbtest-20041102-1/0002-Don-t-use-Werror.patch
create mode 100644 patches/fbtest-20041102-1/0003-Workaround-for-a-gcc-compiler-bug.patch
create mode 100644 patches/fbtest-20041102-1/0004-remove-asm-page.h-use-sysconf.patch
create mode 100644 patches/fbtest-20041102-1/0005-add-install-target.patch
delete mode 100644 patches/fbtest-20041102-1/fbtest-20041102-1-add-make-install.diff
delete mode 100644 patches/fbtest-20041102-1/fbtest-20041102-1-nowerror.diff
delete mode 100644 patches/fbtest-20041102-1/fbtest-20041102-1-optimize-O2.diff
delete mode 100644 patches/fbtest-20041102-1/fbtest-20041102-1-page_mask.diff
delete mode 100644 patches/fbtest-20041102-1/fbtest-20041102-1-penguin.diff
delete mode 100644 patches/fbtest-20041102-1/series
diff --git a/patches/fbtest-20041102-1/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch b/patches/fbtest-20041102-1/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch
new file mode 100644
index 0000000..7976178
--- /dev/null
+++ b/patches/fbtest-20041102-1/0001-provide-a-pre-generated-penguin.c-to-get-rid-of-this.patch
@@ -0,0 +1,659 @@
+From 7eb113bec576a4612a122e9926a6ce17ffc7ad8d Mon Sep 17 00:00:00 2001
+From: Sascha Hauer <sha@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:18:39 +0100
+Subject: [PATCH 1/5] provide a pre-generated penguin.c to get rid of this
+ dependency
+
+fbtest compiles pnmtohex for the host. pnmtohex generates
+penguin.c from penguin.ppm. pnmtohex needs libnetpbm which
+is very painful to compile.
+
+[mkl: added std patch header]
+[mkl: don't delete penguin.c on clean]
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ Makefile | 2 +-
+ images/Makefile | 3 -
+ images/penguin.c | 605 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 606 insertions(+), 4 deletions(-)
+ create mode 100644 images/penguin.c
+
+diff --git a/Makefile b/Makefile
+index b628bd8..f78c67a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,7 +6,7 @@ TARGET = $(CROSS_COMPILE)fbtest
+ OBJS += drawops/drawops.o fonts/fonts.o images/images.o visops/visops.o \
+ tests/tests.o
+
+-SUBDIRS = drawops pnmtohex fonts images visops tests
++SUBDIRS = drawops fonts images visops tests
+
+ include $(TOPDIR)/Rules.make
+
+diff --git a/images/Makefile b/images/Makefile
+index 0883c46..209bdd9 100644
+--- a/images/Makefile
++++ b/images/Makefile
+@@ -19,6 +19,3 @@ include $(TOPDIR)/Rules.make
+ %.c: %.pnm
+ ../pnmtohex/pnmtohex $< $* > $@
+
+-clean::
+- $(RM) $(SRCS)
+-
+diff --git a/images/penguin.c b/images/penguin.c
+new file mode 100644
+index 0000000..e454b99
+--- /dev/null
++++ b/images/penguin.c
+@@ -0,0 +1,605 @@
++ /*
++ * Image penguin
++ */
++
++#include "image.h"
++
++static const unsigned char penguin_data[];
++static const unsigned char penguin_clut[];
++
++const struct image penguin = {
++ width: 80,
++ height: 80,
++ type: IMAGE_CLUT256,
++ data: penguin_data,
++ clut_len: 187,
++ clut: penguin_clut
++};
++
++static const unsigned char penguin_data[6400] = {
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
++ 0x06, 0x06, 0x05, 0x08, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x09, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x01, 0x03, 0x05, 0x0a, 0x0b, 0x0c, 0x0d, 0x0d, 0x0d, 0x0e, 0x0c, 0x0b,
++ 0x0a, 0x05, 0x08, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x04, 0x0a, 0x0c, 0x0f,
++ 0x0c, 0x10, 0x10, 0x04, 0x05, 0x07, 0x0b, 0x0c, 0x0f, 0x11, 0x12, 0x05,
++ 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x09, 0x09, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x02, 0x05, 0x13, 0x14, 0x15, 0x01, 0x16, 0x16, 0x16, 0x16,
++ 0x16, 0x16, 0x16, 0x16, 0x01, 0x0b, 0x0f, 0x0c, 0x10, 0x08, 0x01, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x13,
++ 0x0d, 0x07, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16,
++ 0x16, 0x16, 0x01, 0x11, 0x0d, 0x12, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x09, 0x09, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x0a, 0x14, 0x05, 0x16, 0x16, 0x16,
++ 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x03, 0x12, 0x07, 0x01, 0x16,
++ 0x0a, 0x0d, 0x0a, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x09, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x02, 0x06, 0x0c, 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16,
++ 0x16, 0x16, 0x16, 0x05, 0x0f, 0x17, 0x12, 0x02, 0x16, 0x15, 0x11, 0x07,
++ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x09, 0x09, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0a, 0x0f, 0x02,
++ 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x06,
++ 0x18, 0x18, 0x15, 0x05, 0x16, 0x01, 0x0d, 0x0b, 0x04, 0x01, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x01, 0x04, 0x19, 0x19, 0x16, 0x16, 0x16, 0x16, 0x16,
++ 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x05, 0x0b, 0x10, 0x08, 0x02,
++ 0x16, 0x16, 0x07, 0x14, 0x10, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x09, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
++ 0x06, 0x0d, 0x06, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16,
++ 0x16, 0x16, 0x16, 0x02, 0x02, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x0d,
++ 0x13, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x10, 0x0f, 0x03, 0x16,
++ 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16,
++ 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x0b, 0x0c, 0x05, 0x01, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x03, 0x0a, 0x14, 0x16, 0x16, 0x16, 0x01, 0x02, 0x16,
++ 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x01, 0x03, 0x02, 0x16, 0x16,
++ 0x16, 0x16, 0x16, 0x08, 0x14, 0x07, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
++ 0x12, 0x0f, 0x16, 0x16, 0x01, 0x01, 0x04, 0x07, 0x01, 0x16, 0x16, 0x16,
++ 0x16, 0x16, 0x08, 0x07, 0x02, 0x13, 0x04, 0x16, 0x16, 0x16, 0x16, 0x02,
++ 0x0f, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x09, 0x09, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x12, 0x0f, 0x16, 0x16,
++ 0x10, 0x1a, 0x18, 0x04, 0x04, 0x16, 0x16, 0x16, 0x03, 0x0f, 0x1b, 0x1c,
++ 0x1d, 0x10, 0x05, 0x01, 0x16, 0x16, 0x16, 0x16, 0x0f, 0x12, 0x03, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x03, 0x12, 0x0f, 0x16, 0x03, 0x1e, 0x1f, 0x20, 0x1a,
++ 0x02, 0x16, 0x16, 0x01, 0x21, 0x22, 0x23, 0x24, 0x25, 0x1e, 0x03, 0x01,
++ 0x16, 0x16, 0x16, 0x16, 0x0f, 0x13, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
++ 0x09, 0x09, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
++ 0x12, 0x0f, 0x16, 0x0b, 0x24, 0x20, 0x26, 0x27, 0x15, 0x16, 0x16, 0x06,
++ 0x23, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x0e, 0x16, 0x16, 0x16, 0x16, 0x16,
++ 0x11, 0x15, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x12, 0x14, 0x16, 0x2d,
++ 0x2e, 0x05, 0x0f, 0x26, 0x2a, 0x02, 0x03, 0x12, 0x2f, 0x30, 0x01, 0x11,
++ 0x31, 0x32, 0x33, 0x16, 0x16, 0x16, 0x16, 0x16, 0x11, 0x15, 0x04, 0x01,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x09, 0x00, 0x09, 0x09, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x03, 0x0a, 0x0f, 0x01, 0x1a, 0x2d, 0x01, 0x11, 0x34,
++ 0x35, 0x08, 0x10, 0x0b, 0x2b, 0x2d, 0x16, 0x03, 0x12, 0x30, 0x1f, 0x16,
++ 0x16, 0x16, 0x16, 0x16, 0x0e, 0x19, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
++ 0x09, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
++ 0x0a, 0x18, 0x03, 0x17, 0x35, 0x16, 0x08, 0x1a, 0x36, 0x37, 0x37, 0x38,
++ 0x1c, 0x2d, 0x16, 0x16, 0x16, 0x20, 0x20, 0x01, 0x16, 0x16, 0x16, 0x16,
++ 0x0e, 0x19, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x09, 0x09, 0x00, 0x09, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x10, 0x31, 0x03, 0x15,
++ 0x23, 0x05, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x16,
++ 0x11, 0x27, 0x1b, 0x16, 0x16, 0x16, 0x16, 0x16, 0x11, 0x0c, 0x05, 0x01,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x02, 0x10, 0x0f, 0x03, 0x02, 0x20, 0x42, 0x43, 0x3d,
++ 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x46, 0x3e, 0x4a, 0x4b, 0x0a, 0x16,
++ 0x16, 0x16, 0x16, 0x16, 0x13, 0x0e, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
++ 0x07, 0x0f, 0x03, 0x16, 0x4c, 0x43, 0x4d, 0x44, 0x3c, 0x46, 0x49, 0x4e,
++ 0x4f, 0x50, 0x51, 0x49, 0x49, 0x52, 0x4c, 0x16, 0x16, 0x16, 0x16, 0x16,
++ 0x13, 0x14, 0x07, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x07, 0x14, 0x06, 0x53,
++ 0x54, 0x55, 0x56, 0x44, 0x45, 0x57, 0x49, 0x58, 0x50, 0x51, 0x51, 0x51,
++ 0x52, 0x3f, 0x3e, 0x01, 0x16, 0x16, 0x16, 0x16, 0x05, 0x18, 0x0a, 0x03,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x02, 0x06, 0x0d, 0x13, 0x59, 0x43, 0x5a, 0x5b, 0x3c,
++ 0x46, 0x49, 0x4e, 0x5c, 0x51, 0x51, 0x49, 0x5d, 0x5e, 0x5a, 0x5f, 0x16,
++ 0x16, 0x16, 0x16, 0x16, 0x01, 0x31, 0x0b, 0x08, 0x01, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
++ 0x06, 0x0d, 0x12, 0x04, 0x60, 0x61, 0x44, 0x62, 0x57, 0x49, 0x51, 0x51,
++ 0x49, 0x63, 0x64, 0x65, 0x5a, 0x65, 0x66, 0x16, 0x01, 0x0b, 0x03, 0x16,
++ 0x16, 0x19, 0x0e, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x07, 0x0d, 0x13, 0x01,
++ 0x67, 0x68, 0x69, 0x52, 0x47, 0x46, 0x3f, 0x69, 0x6a, 0x43, 0x65, 0x6b,
++ 0x6c, 0x6d, 0x21, 0x16, 0x16, 0x0d, 0x1a, 0x15, 0x16, 0x04, 0x31, 0x12,
++ 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x02, 0x10, 0x0f, 0x13, 0x01, 0x35, 0x6e, 0x6f, 0x6a,
++ 0x5d, 0x3e, 0x70, 0x5e, 0x55, 0x55, 0x70, 0x42, 0x20, 0x1f, 0x29, 0x03,
++ 0x16, 0x04, 0x1a, 0x1a, 0x04, 0x16, 0x0e, 0x11, 0x06, 0x02, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08,
++ 0x13, 0x17, 0x05, 0x02, 0x1b, 0x30, 0x6e, 0x6f, 0x70, 0x5e, 0x70, 0x43,
++ 0x54, 0x71, 0x72, 0x22, 0x73, 0x2b, 0x25, 0x0c, 0x16, 0x16, 0x13, 0x19,
++ 0x01, 0x16, 0x02, 0x31, 0x13, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x07, 0x0e, 0x0e, 0x16, 0x01,
++ 0x74, 0x1f, 0x30, 0x75, 0x76, 0x6f, 0x6f, 0x77, 0x6e, 0x22, 0x30, 0x23,
++ 0x27, 0x28, 0x28, 0x78, 0x01, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x19,
++ 0x0e, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x02, 0x04, 0x0b, 0x18, 0x08, 0x16, 0x12, 0x2c, 0x2b, 0x30, 0x30,
++ 0x30, 0x22, 0x22, 0x30, 0x30, 0x20, 0x25, 0x79, 0x28, 0x28, 0x28, 0x28,
++ 0x14, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x03, 0x0f, 0x0b, 0x04, 0x01,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x12, 0x31,
++ 0x12, 0x08, 0x01, 0x78, 0x28, 0x27, 0x7a, 0x30, 0x30, 0x30, 0x30, 0x30,
++ 0x7a, 0x2f, 0x7b, 0x28, 0x28, 0x28, 0x28, 0x28, 0x73, 0x03, 0x16, 0x16,
++ 0x16, 0x16, 0x16, 0x16, 0x0a, 0x0f, 0x0a, 0x08, 0x01, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x01, 0x03, 0x10, 0x0e, 0x0c, 0x16, 0x01, 0x31, 0x7b,
++ 0x28, 0x28, 0x32, 0x1f, 0x30, 0x30, 0x20, 0x2b, 0x27, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x14, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16,
++ 0x16, 0x0d, 0x11, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
++ 0x07, 0x0c, 0x0d, 0x01, 0x16, 0x08, 0x24, 0x28, 0x28, 0x28, 0x28, 0x27,
++ 0x26, 0x2f, 0x27, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x7c, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x08, 0x31, 0x19,
++ 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x05, 0x15, 0x31, 0x08, 0x16,
++ 0x16, 0x7d, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x7b, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2f, 0x08, 0x16,
++ 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x08, 0x18, 0x0b, 0x05, 0x02, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x01, 0x04, 0x13, 0x31, 0x05, 0x16, 0x16, 0x03, 0x20, 0x7b, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x7b, 0x79, 0x0b, 0x16, 0x16, 0x16, 0x16, 0x16,
++ 0x16, 0x16, 0x16, 0x10, 0x0f, 0x13, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x10, 0x14,
++ 0x07, 0x16, 0x16, 0x16, 0x0a, 0x20, 0x27, 0x28, 0x28, 0x28, 0x28, 0x7b,
++ 0x79, 0x79, 0x7b, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x7b, 0x27, 0x32,
++ 0x26, 0x2f, 0x17, 0x01, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16,
++ 0x10, 0x14, 0x0a, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x02, 0x05, 0x19, 0x0c, 0x16, 0x16, 0x16, 0x01,
++ 0x11, 0x2e, 0x7a, 0x2c, 0x27, 0x7b, 0x7b, 0x32, 0x26, 0x2f, 0x32, 0x7b,
++ 0x7b, 0x7b, 0x27, 0x2f, 0x25, 0x7a, 0x73, 0x73, 0x1f, 0x73, 0x78, 0x08,
++ 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x19, 0x0c, 0x06,
++ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x03, 0x0a, 0x14, 0x08, 0x16, 0x16, 0x16, 0x02, 0x18, 0x78, 0x24, 0x79,
++ 0x7b, 0x28, 0x28, 0x7b, 0x2c, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x27,
++ 0x32, 0x26, 0x23, 0x73, 0x20, 0x20, 0x23, 0x33, 0x01, 0x03, 0x13, 0x03,
++ 0x16, 0x16, 0x16, 0x16, 0x16, 0x01, 0x0f, 0x12, 0x08, 0x01, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x0b, 0x11, 0x16,
++ 0x16, 0x02, 0x16, 0x04, 0x7e, 0x2f, 0x7b, 0x28, 0x28, 0x28, 0x28, 0x7b,
++ 0x79, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x27,
++ 0x2f, 0x7a, 0x1f, 0x26, 0x18, 0x16, 0x01, 0x10, 0x06, 0x16, 0x16, 0x16,
++ 0x16, 0x16, 0x19, 0x0c, 0x05, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x02, 0x06, 0x0e, 0x13, 0x16, 0x05, 0x05, 0x16, 0x2d,
++ 0x32, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x27, 0x24, 0x73,
++ 0x23, 0x03, 0x16, 0x16, 0x06, 0x04, 0x16, 0x16, 0x16, 0x16, 0x08, 0x0f,
++ 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
++ 0x0a, 0x31, 0x04, 0x16, 0x0a, 0x16, 0x08, 0x24, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x7b, 0x2b, 0x24, 0x17, 0x16, 0x03,
++ 0x08, 0x10, 0x02, 0x16, 0x16, 0x16, 0x16, 0x0d, 0x15, 0x04, 0x01, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x0b, 0x14, 0x16, 0x05,
++ 0x04, 0x16, 0x2a, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x7b, 0x32, 0x1f, 0x01, 0x10, 0x15, 0x05, 0x10, 0x16,
++ 0x16, 0x16, 0x16, 0x12, 0x0d, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x02, 0x06, 0x0e, 0x15, 0x16, 0x0a, 0x16, 0x04, 0x2f, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x7b, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x27, 0x12, 0x10, 0x0a, 0x03, 0x10, 0x03, 0x16, 0x16, 0x16, 0x01,
++ 0x0f, 0x12, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x0a,
++ 0x31, 0x08, 0x08, 0x05, 0x16, 0x1a, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x7b, 0x32, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x18, 0x01,
++ 0x16, 0x16, 0x02, 0x07, 0x16, 0x16, 0x16, 0x16, 0x0e, 0x15, 0x04, 0x01,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x05, 0x0c, 0x14, 0x16, 0x10, 0x01,
++ 0x03, 0x23, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x27, 0x79,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x74, 0x16, 0x16, 0x16, 0x16, 0x12,
++ 0x16, 0x16, 0x16, 0x16, 0x0a, 0x0e, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x01, 0x03, 0x0a, 0x31, 0x05, 0x01, 0x0a, 0x16, 0x0e, 0x7b, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x79, 0x79, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x78, 0x16, 0x16, 0x16, 0x16, 0x12, 0x16, 0x16, 0x16, 0x16,
++ 0x02, 0x0f, 0x10, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x05, 0x0c, 0x14,
++ 0x16, 0x04, 0x08, 0x16, 0x34, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x2c, 0x79, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x7a, 0x16,
++ 0x16, 0x16, 0x16, 0x10, 0x16, 0x16, 0x16, 0x16, 0x01, 0x0f, 0x12, 0x03,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x01, 0x08, 0x12, 0x0f, 0x08, 0x16, 0x07, 0x02, 0x01,
++ 0x23, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2c, 0x79,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2b, 0x01, 0x16, 0x16, 0x01, 0x06,
++ 0x16, 0x16, 0x16, 0x16, 0x16, 0x14, 0x0b, 0x08, 0x01, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
++ 0x05, 0x0c, 0x19, 0x16, 0x16, 0x10, 0x02, 0x05, 0x32, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2f, 0x32, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x2f, 0x01, 0x16, 0x16, 0x02, 0x06, 0x16, 0x16, 0x16, 0x16,
++ 0x16, 0x0c, 0x15, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x10, 0x0d, 0x01, 0x16,
++ 0x16, 0x12, 0x03, 0x0a, 0x27, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x2f, 0x79, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2c, 0x02,
++ 0x16, 0x16, 0x04, 0x03, 0x16, 0x16, 0x16, 0x16, 0x16, 0x0c, 0x19, 0x04,
++ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x01, 0x08, 0x13, 0x0e, 0x16, 0x16, 0x03, 0x11, 0x07, 0x19,
++ 0x7b, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2f, 0x27,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2c, 0x03, 0x16, 0x16, 0x06, 0x16,
++ 0x16, 0x16, 0x16, 0x16, 0x16, 0x0c, 0x19, 0x04, 0x01, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08,
++ 0x0b, 0x19, 0x16, 0x16, 0x16, 0x06, 0x12, 0x11, 0x7b, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2f, 0x27, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x26, 0x02, 0x16, 0x01, 0x06, 0x16, 0x16, 0x16, 0x16, 0x16,
++ 0x16, 0x0c, 0x15, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x15, 0x19, 0x16, 0x16,
++ 0x16, 0x16, 0x06, 0x0d, 0x7b, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x2f, 0x27, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x7a, 0x16,
++ 0x04, 0x07, 0x7f, 0x04, 0x05, 0x08, 0x01, 0x16, 0x16, 0x14, 0x0b, 0x08,
++ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x01, 0x05, 0x19, 0x2d, 0x80, 0x64, 0x61, 0x37, 0x01, 0x19,
++ 0x32, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2f, 0x27,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x33, 0x08, 0x03, 0x16, 0x16, 0x16,
++ 0x01, 0x08, 0x0c, 0x10, 0x01, 0x18, 0x13, 0x08, 0x01, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x08, 0x10,
++ 0x0d, 0x81, 0x5a, 0x82, 0x83, 0x83, 0x5f, 0x02, 0x31, 0x32, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2f, 0x7b, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x84,
++ 0x85, 0x85, 0x86, 0x41, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x10, 0x12,
++ 0x05, 0x2d, 0x0b, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x01, 0x03, 0x04, 0x06, 0x10, 0x13, 0x11, 0x2d, 0x71, 0x3b, 0x82,
++ 0x83, 0x83, 0x83, 0x3a, 0x01, 0x0e, 0x26, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x2f, 0x7b, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x87, 0x88, 0x49, 0x46, 0x89,
++ 0x16, 0x16, 0x16, 0x16, 0x16, 0x01, 0x06, 0x05, 0x63, 0x8a, 0x0c, 0x05,
++ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x10, 0x15,
++ 0x0d, 0x0f, 0x17, 0x2a, 0x40, 0x65, 0x8b, 0x8c, 0x83, 0x83, 0x83, 0x62,
++ 0x66, 0x16, 0x12, 0x1f, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2c, 0x79,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x8d, 0x82, 0x88, 0x8e, 0x8f, 0x16, 0x16, 0x16, 0x16,
++ 0x16, 0x16, 0x01, 0x37, 0x57, 0x46, 0x14, 0x07, 0x02, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x03, 0x10, 0x11, 0x90, 0x71, 0x5e, 0x70, 0x70,
++ 0x6b, 0x3b, 0x82, 0x83, 0x83, 0x83, 0x83, 0x83, 0x3d, 0x91, 0x16, 0x04,
++ 0x33, 0x7b, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x7b, 0x79, 0x8d,
++ 0x44, 0x3c, 0x6b, 0x91, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x53, 0x3d,
++ 0x62, 0x3c, 0x92, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
++ 0x04, 0x0b, 0x90, 0x6b, 0x3b, 0x56, 0x3b, 0x3b, 0x5b, 0x82, 0x83, 0x83,
++ 0x83, 0x83, 0x83, 0x83, 0x88, 0x3e, 0x02, 0x16, 0x01, 0x1a, 0x79, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x2f, 0x1f, 0x93, 0x5b, 0x5b, 0x65, 0x60,
++ 0x7f, 0x16, 0x16, 0x16, 0x01, 0x94, 0x5e, 0x5b, 0x44, 0x44, 0x95, 0x15,
++ 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x11, 0x96, 0x3b,
++ 0x44, 0x82, 0x82, 0x8c, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
++ 0x83, 0x46, 0x97, 0x16, 0x16, 0x16, 0x0c, 0x2b, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x7a, 0x1f, 0x98, 0x56, 0x56, 0x5a, 0x43, 0x99, 0x9a, 0x66, 0x9a,
++ 0x9b, 0x70, 0x3b, 0x44, 0x82, 0x82, 0x9c, 0x0d, 0x07, 0x03, 0x01, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x01, 0x06, 0x0d, 0x71, 0x3b, 0x44, 0x83, 0x83, 0x83,
++ 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x88, 0x63, 0x8f,
++ 0x16, 0x16, 0x16, 0x10, 0x24, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x7b, 0x7a, 0x1f, 0x9d,
++ 0x3b, 0x5b, 0x9e, 0x65, 0x5e, 0x70, 0x43, 0x70, 0x65, 0x3b, 0x82, 0x83,
++ 0x83, 0x8c, 0x3d, 0x95, 0x19, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
++ 0x06, 0x0d, 0x9f, 0x9e, 0x44, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
++ 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x88, 0x68, 0x16, 0x16, 0x16, 0x16,
++ 0x0d, 0x7b, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x7b, 0x25, 0x1f, 0xa0, 0x4d, 0x5b, 0x8b, 0x9e,
++ 0x5a, 0x6b, 0x6b, 0x5a, 0x3b, 0x44, 0x83, 0x83, 0x83, 0x83, 0x82, 0xa1,
++ 0x17, 0x15, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x0e, 0x9f, 0x5a,
++ 0x5b, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
++ 0x83, 0x83, 0x88, 0x52, 0x53, 0x16, 0x16, 0x16, 0x04, 0x32, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x26, 0x22, 0x96, 0x5a, 0x5b, 0x44, 0x5b, 0x56, 0x3b, 0x3b, 0x56,
++ 0x5b, 0x82, 0x83, 0x83, 0x83, 0x83, 0x8c, 0x44, 0xa1, 0x2d, 0x0c, 0x07,
++ 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x01, 0x05, 0x11, 0xa2, 0x6b, 0x5b, 0x83, 0x83, 0x83,
++ 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x88,
++ 0x69, 0x7f, 0x16, 0x16, 0x12, 0x27, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2b, 0x0f, 0x6f,
++ 0x5a, 0x5b, 0x82, 0x8c, 0x82, 0x44, 0x44, 0x82, 0x82, 0x8c, 0x83, 0x83,
++ 0x83, 0x83, 0x83, 0x83, 0x82, 0x3d, 0xa3, 0x0c, 0x06, 0x02, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
++ 0x05, 0x11, 0xa2, 0x65, 0x5b, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
++ 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x46, 0x37, 0x07, 0x2d,
++ 0x2b, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x79, 0x14, 0x7f, 0x99, 0x5a, 0x5b, 0x82, 0x83,
++ 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
++ 0x83, 0x83, 0x82, 0xa2, 0x12, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x0d, 0xa2, 0x65,
++ 0x5b, 0x8c, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
++ 0x83, 0x83, 0x83, 0x83, 0x88, 0x3f, 0x72, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x24,
++ 0x15, 0x16, 0x8f, 0x9b, 0x5a, 0x5b, 0x8c, 0x83, 0x83, 0x83, 0x83, 0x83,
++ 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x8c, 0x82, 0xa0,
++ 0x0b, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x03, 0x10, 0x0f, 0x96, 0x6b, 0x5b, 0x8c, 0x83, 0x83,
++ 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
++ 0x83, 0x46, 0x69, 0x25, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x28, 0x28, 0x28, 0x28, 0x28, 0x7b, 0x2e, 0x05, 0x16, 0x16, 0x41, 0x99,
++ 0x4d, 0x44, 0x8c, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
++ 0x83, 0x83, 0x83, 0x83, 0x8c, 0x5b, 0x9e, 0xa3, 0x12, 0x08, 0x01, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08,
++ 0x13, 0xa4, 0x43, 0x9e, 0x82, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
++ 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x82, 0x52, 0x61, 0xa5,
++ 0x26, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
++ 0x1f, 0x0c, 0x16, 0x16, 0x16, 0x16, 0xa6, 0x6f, 0x4d, 0x44, 0x8c, 0x83,
++ 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x82,
++ 0x8b, 0x6b, 0x90, 0x0c, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x15, 0x76, 0x55, 0x8b,
++ 0x82, 0x8c, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
++ 0x83, 0x83, 0x83, 0x83, 0x8c, 0x5b, 0x61, 0x99, 0x53, 0x1b, 0x24, 0x7b,
++ 0x28, 0x28, 0x28, 0x7b, 0x79, 0x23, 0x74, 0x0c, 0x01, 0x16, 0x16, 0x16,
++ 0x16, 0x16, 0x53, 0x99, 0x5a, 0x5b, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
++ 0x83, 0x83, 0x83, 0x83, 0x83, 0x44, 0x56, 0x5a, 0x71, 0x95, 0x11, 0x10,
++ 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x01, 0x04, 0x19, 0x77, 0x55, 0x9e, 0x5b, 0x44, 0x82, 0x82,
++ 0x8c, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
++ 0x83, 0x5b, 0x5a, 0xa7, 0xa8, 0x16, 0x01, 0x06, 0x0b, 0x19, 0x13, 0x10,
++ 0x03, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x01, 0xa8, 0x9b,
++ 0x6b, 0x5b, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x82, 0x44, 0x44,
++ 0x56, 0x65, 0x9f, 0x95, 0x14, 0x0b, 0x07, 0x08, 0x01, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08,
++ 0x13, 0xa9, 0x43, 0x5e, 0x5a, 0x4d, 0x9e, 0x3b, 0x56, 0x5b, 0x44, 0x44,
++ 0x82, 0x8c, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x8c, 0x56, 0x65, 0x99,
++ 0x59, 0x02, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16,
++ 0x16, 0x16, 0x16, 0x16, 0x16, 0x01, 0xaa, 0x9b, 0x55, 0x56, 0x82, 0x83,
++ 0x83, 0x83, 0x8c, 0x82, 0x44, 0x56, 0x9e, 0x6b, 0x96, 0x95, 0x0f, 0x15,
++ 0x10, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x11, 0xab, 0xa9,
++ 0x9b, 0x54, 0x43, 0x70, 0x5e, 0x55, 0x6b, 0x4d, 0x9e, 0x56, 0x44, 0x82,
++ 0x8c, 0x8c, 0x8c, 0x8c, 0x44, 0x5a, 0x64, 0xac, 0x59, 0x7f, 0x16, 0x16,
++ 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16,
++ 0x16, 0x01, 0xa8, 0xac, 0x43, 0x4d, 0x5b, 0x44, 0x8c, 0x82, 0x44, 0x5b,
++ 0x9e, 0x55, 0x43, 0x76, 0x18, 0x19, 0x0a, 0x04, 0x03, 0x01, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x01, 0x08, 0x07, 0x15, 0x0d, 0x21, 0x95, 0xa5, 0x6f,
++ 0x99, 0x9b, 0xa7, 0x54, 0x64, 0x70, 0x65, 0x4d, 0x3b, 0x5b, 0x5b, 0x8b,
++ 0x4d, 0x70, 0x99, 0xad, 0xaa, 0x02, 0x16, 0x16, 0x08, 0x10, 0x10, 0x10,
++ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x05, 0x16, 0x16, 0x01, 0x94, 0x60,
++ 0xa7, 0x5e, 0x4d, 0x56, 0x8b, 0x56, 0x4d, 0x65, 0x43, 0x99, 0x95, 0x14,
++ 0x13, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x01, 0x03, 0x04, 0x07, 0x0a, 0x15, 0x0e, 0x0f, 0x21, 0xae, 0xaf, 0x4c,
++ 0x60, 0xac, 0x99, 0x54, 0x64, 0x70, 0x55, 0x5e, 0x54, 0x6f, 0xad, 0x59,
++ 0xa6, 0x0b, 0x7d, 0x21, 0x0f, 0x14, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d,
++ 0x0d, 0x14, 0x0f, 0x18, 0x2d, 0x17, 0xb0, 0xb1, 0x6f, 0x54, 0x43, 0x5e,
++ 0x55, 0x5e, 0x43, 0xa7, 0x68, 0xa4, 0x11, 0x0a, 0x04, 0x02, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02,
++ 0x03, 0x04, 0x06, 0x10, 0x13, 0x19, 0x0e, 0x31, 0x21, 0x92, 0x4c, 0xb1,
++ 0x60, 0xac, 0xac, 0xac, 0xb2, 0xb1, 0x97, 0xb3, 0x21, 0x14, 0x15, 0x12,
++ 0x10, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x10, 0x0a,
++ 0x0b, 0x14, 0xb4, 0xaa, 0xb5, 0x6f, 0x9b, 0xa7, 0xa7, 0x9b, 0xac, 0x4c,
++ 0x21, 0x19, 0x07, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02,
++ 0x08, 0x04, 0x06, 0x0a, 0x13, 0x0c, 0x0f, 0x21, 0xb6, 0x97, 0x59, 0x59,
++ 0x59, 0xaa, 0xb7, 0x31, 0x19, 0x10, 0x04, 0x03, 0x02, 0x02, 0x02, 0x02,
++ 0x02, 0x02, 0x01, 0x02, 0x02, 0x02, 0x02, 0x03, 0x04, 0x0a, 0x11, 0xb8,
++ 0xa8, 0x59, 0xb1, 0x60, 0xb5, 0x9a, 0xb9, 0x0f, 0x15, 0x06, 0x03, 0x01,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03,
++ 0x08, 0x05, 0x10, 0x0b, 0x11, 0x0f, 0xb4, 0xb8, 0xb8, 0x0f, 0x0e, 0x13,
++ 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x07, 0x15, 0x14, 0xb8, 0xb8, 0xb8,
++ 0xba, 0xb4, 0x0e, 0x13, 0x05, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x08,
++ 0x06, 0x10, 0x12, 0x0b, 0x13, 0x0a, 0x06, 0x08, 0x02, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x01, 0x03, 0x05, 0x10, 0x13, 0x15, 0x15, 0x0b, 0x0a, 0x06, 0x08,
++ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x03, 0x08,
++ 0x08, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
++ 0x03, 0x08, 0x04, 0x04, 0x08, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00,
++};
++
++static const unsigned char penguin_clut[561] = {
++ 0x00, 0x00, 0x00, 0x06, 0x06, 0x06, 0x0a, 0x0a, 0x0a, 0x0e, 0x0e, 0x0e,
++ 0x16, 0x16, 0x16, 0x1a, 0x1a, 0x1a, 0x1e, 0x1e, 0x1e, 0x22, 0x22, 0x22,
++ 0x12, 0x12, 0x12, 0x00, 0x00, 0x01, 0x2a, 0x2a, 0x2a, 0x36, 0x36, 0x36,
++ 0x42, 0x42, 0x42, 0x4e, 0x4e, 0x4e, 0x4a, 0x4a, 0x4a, 0x56, 0x56, 0x56,
++ 0x26, 0x26, 0x26, 0x46, 0x46, 0x46, 0x2e, 0x2e, 0x2e, 0x32, 0x32, 0x32,
++ 0x52, 0x52, 0x52, 0x3a, 0x3a, 0x3a, 0x02, 0x02, 0x06, 0x65, 0x65, 0x65,
++ 0x5e, 0x5e, 0x5e, 0x3e, 0x3e, 0x3e, 0x74, 0x74, 0x74, 0x8a, 0x8a, 0x8a,
++ 0xa2, 0xa2, 0xa2, 0x9a, 0x9a, 0x9a, 0x86, 0x86, 0x86, 0xc6, 0xc6, 0xc6,
++ 0xc3, 0xc3, 0xc3, 0x65, 0x62, 0x59, 0xbb, 0xbb, 0xbb, 0xd2, 0xd2, 0xd2,
++ 0xda, 0xda, 0xda, 0xd6, 0xd6, 0xd6, 0xe2, 0xe2, 0xe2, 0xf6, 0xf6, 0xf6,
++ 0xfd, 0xfd, 0xfd, 0xae, 0xae, 0xae, 0x7b, 0x7b, 0x7b, 0xdd, 0xdd, 0xdd,
++ 0xea, 0xea, 0xea, 0x6a, 0x6a, 0x6a, 0xaa, 0xaa, 0xaa, 0xe7, 0xe7, 0xe7,
++ 0xbe, 0xbe, 0xbe, 0x5a, 0x5a, 0x5a, 0xee, 0xee, 0xee, 0x9e, 0x9e, 0x9e,
++ 0x95, 0x95, 0x95, 0x80, 0x80, 0x80, 0x76, 0x62, 0x2e, 0x79, 0x5c, 0x08,
++ 0x62, 0x4e, 0x0a, 0x36, 0x26, 0x06, 0x9a, 0x72, 0x0a, 0xe2, 0xaa, 0x0b,
++ 0xec, 0xba, 0x0b, 0xe1, 0xaf, 0x0f, 0xb8, 0x90, 0x0c, 0xd7, 0xae, 0x0f,
++ 0xaf, 0x92, 0x3d, 0x25, 0x1a, 0x09, 0xbc, 0xa4, 0x73, 0xc0, 0x85, 0x09,
++ 0xef, 0xb6, 0x0d, 0xea, 0xbe, 0x0a, 0xe8, 0xc3, 0x10, 0xe8, 0xc8, 0x1e,
++ 0xf5, 0xcf, 0x2d, 0xf1, 0xd0, 0x13, 0xda, 0xc2, 0x86, 0xd3, 0xce, 0xba,
++ 0x79, 0x57, 0x19, 0xdb, 0xa2, 0x0a, 0xf4, 0xd6, 0x36, 0xf6, 0xda, 0x3c,
++ 0xf6, 0xda, 0x26, 0xf6, 0xd7, 0x14, 0xe2, 0xb8, 0x0d, 0x3d, 0x2a, 0x06,
++ 0xb4, 0x7b, 0x07, 0xce, 0x91, 0x0a, 0xe6, 0xae, 0x0b, 0xee, 0xca, 0x0f,
++ 0xf6, 0xda, 0x4a, 0x68, 0x45, 0x06, 0xd8, 0x9e, 0x0a, 0xec, 0xb2, 0x0c,
++ 0xf5, 0xd7, 0x2b, 0xc6, 0x9b, 0x0a, 0xc8, 0x90, 0x0b, 0x9c, 0x76, 0x0a,
++ 0x89, 0x5c, 0x06, 0xd2, 0xa2, 0x0a, 0xee, 0xbe, 0x0a, 0xcb, 0xa6, 0x11,
++ 0xb9, 0x85, 0x0b, 0xd2, 0x96, 0x0a, 0x66, 0x4e, 0x0a, 0x5e, 0x46, 0x1e,
++ 0x8b, 0x66, 0x0f, 0xbe, 0x92, 0x0d, 0xa8, 0x7a, 0x0a, 0xd5, 0x9a, 0x0b,
++ 0xca, 0x96, 0x22, 0xb6, 0x9d, 0x6a, 0xae, 0x9a, 0x72, 0x9c, 0x6b, 0x0b,
++ 0xc5, 0x8a, 0x0b, 0xbe, 0x8e, 0x22, 0xbe, 0xb2, 0x90, 0xca, 0xca, 0xca,
++ 0x90, 0x90, 0x90, 0xb2, 0xa6, 0x92, 0x9a, 0x79, 0x3c, 0xa8, 0x7c, 0x2c,
++ 0xb6, 0xb6, 0xb6, 0xf2, 0xf2, 0xf2, 0xce, 0xce, 0xce, 0xfa, 0xfa, 0xfa,
++ 0xb2, 0xb2, 0xb2, 0x6e, 0x6e, 0x6e, 0xa6, 0xa6, 0xa6, 0x12, 0x0e, 0x06,
++ 0x4a, 0x36, 0x0e, 0x8e, 0x86, 0x6a, 0xf2, 0xba, 0x0e, 0xf6, 0xbe, 0x0e,
++ 0xf6, 0xe6, 0xbe, 0xee, 0xcc, 0x5b, 0xb5, 0x8e, 0x2c, 0xe4, 0xb8, 0x3e,
++ 0xf1, 0xc4, 0x0e, 0x26, 0x1e, 0x0a, 0x9a, 0x8e, 0x5a, 0xea, 0xae, 0x0d,
++ 0xf6, 0xba, 0x0e, 0xe0, 0xb2, 0x3e, 0xd2, 0xa6, 0x0a, 0x16, 0x12, 0x06,
++ 0x9a, 0x7a, 0x2e, 0x2e, 0x20, 0x06, 0x70, 0x64, 0x4e, 0xd6, 0xaa, 0x36,
++ 0x46, 0x2f, 0x06, 0x7c, 0x70, 0x58, 0xb4, 0x85, 0x24, 0x62, 0x46, 0x06,
++ 0xd6, 0xa6, 0x3a, 0xa3, 0x6e, 0x08, 0x74, 0x51, 0x08, 0xa7, 0x72, 0x07,
++ 0xa2, 0x92, 0x5e, 0xca, 0xa2, 0x45, 0xe0, 0xa6, 0x0a, 0xae, 0x87, 0x32,
++ 0xbe, 0x96, 0x2e, 0xce, 0xa2, 0x2a, 0xa3, 0x85, 0x43, 0x8e, 0x7a, 0x48,
++ 0x6d, 0x6a, 0x5f, 0x8e, 0x6e, 0x2e, 0x32, 0x22, 0x06, 0xaf, 0x76, 0x06,
++ 0x50, 0x36, 0x07, 0x9e, 0x76, 0x24, 0x5b, 0x3c, 0x06, 0x8a, 0x6e, 0x32,
++ 0x98, 0x63, 0x06, 0x82, 0x53, 0x06, 0x7a, 0x66, 0x46, 0x82, 0x62, 0x2e,
++ 0x56, 0x42, 0x22, 0x7c, 0x50, 0x06, 0x8a, 0x56, 0x06, 0x56, 0x42, 0x1e,
++ 0x5e, 0x56, 0x4c, 0x86, 0x56, 0x06, 0x6a, 0x56, 0x3a, 0x52, 0x3e, 0x22,
++ 0x59, 0x51, 0x42, 0x64, 0x52, 0x34, 0x5e, 0x56, 0x42,
++};
++
+--
+1.7.7
+
diff --git a/patches/fbtest-20041102-1/0002-Don-t-use-Werror.patch b/patches/fbtest-20041102-1/0002-Don-t-use-Werror.patch
new file mode 100644
index 0000000..f5525e0
--- /dev/null
+++ b/patches/fbtest-20041102-1/0002-Don-t-use-Werror.patch
@@ -0,0 +1,29 @@
+From 66d87e8c8a88dcf1cee99b033bae2b336ad10627 Mon Sep 17 00:00:00 2001
+From: Sascha Hauer <s.hauer@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:18:39 +0100
+Subject: [PATCH 2/5] Don't use -Werror
+
+Remove the -Werror flag to compile it with gcc4. Yes I know, a real fix
+different ;)
+
+Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
+---
+ Rules.make | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Rules.make b/Rules.make
+index d8ed6a0..a002453 100644
+--- a/Rules.make
++++ b/Rules.make
+@@ -6,7 +6,7 @@ HOSTCC = gcc
+ IFLAGS = -I$(TOPDIR)/include
+ #DFLAGS = -g
+ OFLAGS = -O3 -fomit-frame-pointer
+-CFLAGS = -Wall -Werror $(IFLAGS) $(DFLAGS) $(OFLAGS)
++CFLAGS = -Wall $(IFLAGS) $(DFLAGS) $(OFLAGS)
+
+ SRCS += $(wildcard *.c)
+ OBJS += $(subst .c,.o,$(SRCS))
+--
+1.7.7
+
diff --git a/patches/fbtest-20041102-1/0003-Workaround-for-a-gcc-compiler-bug.patch b/patches/fbtest-20041102-1/0003-Workaround-for-a-gcc-compiler-bug.patch
new file mode 100644
index 0000000..6701feb
--- /dev/null
+++ b/patches/fbtest-20041102-1/0003-Workaround-for-a-gcc-compiler-bug.patch
@@ -0,0 +1,47 @@
+From 692379c8d36dbaea995a23f86de5c6f9757e5ccc Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:18:39 +0100
+Subject: [PATCH 3/5] Workaround for a gcc compiler bug
+
+With older or unpatched gccs, we get this error:
+
+arm-v4t-linux-gnueabi-gcc -c -Wall -I../include -O3 -fomit-frame-pointer -o directcolor.o directcolor.c
+directcolor.c: In function 'directcolor_update_cmap':
+directcolor.c:154: error: unrecognizable insn:
+(insn 275 117 273 13 (set (reg:HI 14 lr)
+ (mem/s:HI (plus:SI (mult:SI (reg/v:SI 1 r1 [orig:112 i ] [112])
+ (const_int 16 [0x10]))
+ (reg:SI 6 r6 [orig:120 clut.21 ] [120])) [11 <variable>.r+0 S4 A32])) -1 (nil)
+ (nil))
+directcolor.c:154: internal compiler error: in extract_insn, at recog.c:2084
+Please submit a full bug report,
+with preprocessed source if appropriate.
+See <URL:http://gcc.gnu.org/bugs.html> for instructions.
+make[2]: *** [directcolor.o] Error 1
+
+The bug is described here:
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28675
+
+It is closed in recent 4.1, 4.2 and later versions of gcc.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ Rules.make | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Rules.make b/Rules.make
+index a002453..5ef8cef 100644
+--- a/Rules.make
++++ b/Rules.make
+@@ -5,7 +5,7 @@ HOSTCC = gcc
+
+ IFLAGS = -I$(TOPDIR)/include
+ #DFLAGS = -g
+-OFLAGS = -O3 -fomit-frame-pointer
++OFLAGS = -O2 -fomit-frame-pointer
+ CFLAGS = -Wall $(IFLAGS) $(DFLAGS) $(OFLAGS)
+
+ SRCS += $(wildcard *.c)
+--
+1.7.7
+
diff --git a/patches/fbtest-20041102-1/0004-remove-asm-page.h-use-sysconf.patch b/patches/fbtest-20041102-1/0004-remove-asm-page.h-use-sysconf.patch
new file mode 100644
index 0000000..2bef50b
--- /dev/null
+++ b/patches/fbtest-20041102-1/0004-remove-asm-page.h-use-sysconf.patch
@@ -0,0 +1,87 @@
+From 7126f6c74d4d2a6e339f26872959d057dc18bf4b Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:18:39 +0100
+Subject: [PATCH 4/5] remove asm/page.h, use sysconf
+
+remove include asm/page.h, use susconf instead of hard coded PAGE_MASK and PAGE_SIZE
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ fb.c | 11 +++++------
+ main.c | 3 +++
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/fb.c b/fb.c
+index f0bef27..db576d2 100644
+--- a/fb.c
++++ b/fb.c
+@@ -19,8 +19,6 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+
+-#include <asm/page.h>
+-
+ #include "types.h"
+ #include "fb.h"
+ #include "util.h"
+@@ -37,6 +35,7 @@ static unsigned long fb_start;
+ static u32 fb_len, fb_offset;
+ u8 *fb;
+
++extern unsigned long page_mask;
+
+ /*
+ * Saved frame buffer device state
+@@ -181,9 +180,9 @@ void fb_map(void)
+ caddr_t addr;
+
+ Debug("fb_map()\n");
+- fb_start = (unsigned long)fb_fix.smem_start & PAGE_MASK;
+- fb_offset = (unsigned long)fb_fix.smem_start & ~PAGE_MASK;
+- fb_len = (fb_offset+fb_fix.smem_len+~PAGE_MASK) & PAGE_MASK;
++ fb_start = (unsigned long)fb_fix.smem_start & page_mask;
++ fb_offset = (unsigned long)fb_fix.smem_start & ~page_mask;
++ fb_len = (fb_offset+fb_fix.smem_len+~page_mask) & page_mask;
+ Debug("fb_start = %lx, fb_offset = %x, fb_len = %x\n", fb_start, fb_offset,
+ fb_len);
+ addr = mmap(NULL, fb_len, PROT_READ | PROT_WRITE, MAP_SHARED, fb_fd, 0);
+@@ -200,7 +199,7 @@ void fb_map(void)
+ void fb_unmap(void)
+ {
+ Debug("fb_unmap()\n");
+- if (munmap((caddr_t)((unsigned long)fb & PAGE_MASK), fb_len) == -1)
++ if (munmap((caddr_t)((unsigned long)fb & page_mask), fb_len) == -1)
+ Fatal("munmap smem: %s\n", strerror(errno));
+ }
+
+diff --git a/main.c b/main.c
+index a13c800..6c646a1 100644
+--- a/main.c
++++ b/main.c
+@@ -13,6 +13,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+
+ #include "types.h"
+ #include "util.h"
+@@ -28,6 +29,7 @@
+ const char *ProgramName;
+
+ const char *Opt_Fbdev = DEFAULT_FBDEV;
++unsigned long page_mask;
+ int Opt_Debug = 0;
+ int Opt_List = 0;
+ int Opt_Quiet = 0;
+@@ -73,6 +75,7 @@ static void SigHandler(int signo)
+
+ int main(int argc, char *argv[])
+ {
++ page_mask = ~(sysconf(_SC_PAGE_SIZE)-1);
+ ProgramName = argv[0];
+
+ while (argc > 1 && argv[1][0] == '-') {
+--
+1.7.7
+
diff --git a/patches/fbtest-20041102-1/0005-add-install-target.patch b/patches/fbtest-20041102-1/0005-add-install-target.patch
new file mode 100644
index 0000000..fd8ff04
--- /dev/null
+++ b/patches/fbtest-20041102-1/0005-add-install-target.patch
@@ -0,0 +1,24 @@
+From ee6e99e6499374583d2afe216d2605b595582e9d Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:18:39 +0100
+Subject: [PATCH 5/5] add install target
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ Makefile | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f78c67a..a4ef6df 100644
+--- a/Makefile
++++ b/Makefile
+@@ -10,3 +10,6 @@ SUBDIRS = drawops fonts images visops tests
+
+ include $(TOPDIR)/Rules.make
+
++install:
++ install -c $(TARGET) $(DESTDIR)/sbin/fbtest
++
+--
+1.7.7
+
diff --git a/patches/fbtest-20041102-1/fbtest-20041102-1-add-make-install.diff b/patches/fbtest-20041102-1/fbtest-20041102-1-add-make-install.diff
deleted file mode 100644
index 1630455..0000000
--- a/patches/fbtest-20041102-1/fbtest-20041102-1-add-make-install.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: add install target
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- Makefile | 3 +++
- 1 file changed, 3 insertions(+)
-
-Index: b/Makefile
-===================================================================
---- a/Makefile
-+++ b/Makefile
-@@ -10,3 +10,6 @@ SUBDIRS = drawops fonts images visops te
-
- include $(TOPDIR)/Rules.make
-
-+install:
-+ install -c $(TARGET) $(DESTDIR)/sbin/fbtest
-+
diff --git a/patches/fbtest-20041102-1/fbtest-20041102-1-nowerror.diff b/patches/fbtest-20041102-1/fbtest-20041102-1-nowerror.diff
deleted file mode 100644
index 3e6f9df..0000000
--- a/patches/fbtest-20041102-1/fbtest-20041102-1-nowerror.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Sascha Hauer <s.hauer@pengutronix.de>
-Subject: Don't use -Werror
-
-Remove the -Werror flag to compile it with gcc4. Yes I know, a real fix
-different ;)
-
-Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-
----
-
-diff -urN fbtest-20041102-1.orig/Rules.make fbtest-20041102-1/Rules.make
---- fbtest-20041102-1.orig/Rules.make 2003-01-20 13:58:47.000000000 +0100
-+++ fbtest-20041102-1/Rules.make 2006-02-22 14:55:44.000000000 +0100
-@@ -6,7 +6,7 @@
- IFLAGS = -I$(TOPDIR)/include
- #DFLAGS = -g
- OFLAGS = -O3 -fomit-frame-pointer
--CFLAGS = -Wall -Werror $(IFLAGS) $(DFLAGS) $(OFLAGS)
-+CFLAGS = -Wall $(IFLAGS) $(DFLAGS) $(OFLAGS)
-
- SRCS += $(wildcard *.c)
- OBJS += $(subst .c,.o,$(SRCS))
diff --git a/patches/fbtest-20041102-1/fbtest-20041102-1-optimize-O2.diff b/patches/fbtest-20041102-1/fbtest-20041102-1-optimize-O2.diff
deleted file mode 100644
index 5b63136..0000000
--- a/patches/fbtest-20041102-1/fbtest-20041102-1-optimize-O2.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: Workaround for a gcc compiler bug
-
-With older or unpatched gccs, we get this error:
-
-arm-v4t-linux-gnueabi-gcc -c -Wall -I../include -O3 -fomit-frame-pointer -o directcolor.o directcolor.c
-directcolor.c: In function 'directcolor_update_cmap':
-directcolor.c:154: error: unrecognizable insn:
-(insn 275 117 273 13 (set (reg:HI 14 lr)
- (mem/s:HI (plus:SI (mult:SI (reg/v:SI 1 r1 [orig:112 i ] [112])
- (const_int 16 [0x10]))
- (reg:SI 6 r6 [orig:120 clut.21 ] [120])) [11 <variable>.r+0 S4 A32])) -1 (nil)
- (nil))
-directcolor.c:154: internal compiler error: in extract_insn, at recog.c:2084
-Please submit a full bug report,
-with preprocessed source if appropriate.
-See <URL:http://gcc.gnu.org/bugs.html> for instructions.
-make[2]: *** [directcolor.o] Error 1
-
-The bug is described here:
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28675
-
-It is closed in recent 4.1, 4.2 and later versions of gcc.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
-
-Index: fbtest-20041102-1/Rules.make
-===================================================================
---- fbtest-20041102-1.orig/Rules.make
-+++ fbtest-20041102-1/Rules.make
-@@ -5,7 +5,7 @@ HOSTCC = gcc
-
- IFLAGS = -I$(TOPDIR)/include
- #DFLAGS = -g
--OFLAGS = -O3 -fomit-frame-pointer
-+OFLAGS = -O2 -fomit-frame-pointer
- CFLAGS = -Wall $(IFLAGS) $(DFLAGS) $(OFLAGS)
-
- SRCS += $(wildcard *.c)
diff --git a/patches/fbtest-20041102-1/fbtest-20041102-1-page_mask.diff b/patches/fbtest-20041102-1/fbtest-20041102-1-page_mask.diff
deleted file mode 100644
index b69a3ab..0000000
--- a/patches/fbtest-20041102-1/fbtest-20041102-1-page_mask.diff
+++ /dev/null
@@ -1,83 +0,0 @@
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Subject: remove asm/page.h, use sysconf
-
-remove include asm/page.h, use susconf instead of hard coded PAGE_MASK and PAGE_SIZE
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-
----
- fb.c | 11 +++++------
- main.c | 3 +++
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-Index: fbtest-20041102-1/fb.c
-===================================================================
---- fbtest-20041102-1.orig/fb.c
-+++ fbtest-20041102-1/fb.c
-@@ -19,8 +19,6 @@
- #include <sys/stat.h>
- #include <unistd.h>
-
--#include <asm/page.h>
--
- #include "types.h"
- #include "fb.h"
- #include "util.h"
-@@ -37,6 +35,7 @@ static unsigned long fb_start;
- static u32 fb_len, fb_offset;
- u8 *fb;
-
-+extern unsigned long page_mask;
-
- /*
- * Saved frame buffer device state
-@@ -181,9 +180,9 @@ void fb_map(void)
- caddr_t addr;
-
- Debug("fb_map()\n");
-- fb_start = (unsigned long)fb_fix.smem_start & PAGE_MASK;
-- fb_offset = (unsigned long)fb_fix.smem_start & ~PAGE_MASK;
-- fb_len = (fb_offset+fb_fix.smem_len+~PAGE_MASK) & PAGE_MASK;
-+ fb_start = (unsigned long)fb_fix.smem_start & page_mask;
-+ fb_offset = (unsigned long)fb_fix.smem_start & ~page_mask;
-+ fb_len = (fb_offset+fb_fix.smem_len+~page_mask) & page_mask;
- Debug("fb_start = %lx, fb_offset = %x, fb_len = %x\n", fb_start, fb_offset,
- fb_len);
- addr = mmap(NULL, fb_len, PROT_READ | PROT_WRITE, MAP_SHARED, fb_fd, 0);
-@@ -200,7 +199,7 @@ void fb_map(void)
- void fb_unmap(void)
- {
- Debug("fb_unmap()\n");
-- if (munmap((caddr_t)((unsigned long)fb & PAGE_MASK), fb_len) == -1)
-+ if (munmap((caddr_t)((unsigned long)fb & page_mask), fb_len) == -1)
- Fatal("munmap smem: %s\n", strerror(errno));
- }
-
-Index: fbtest-20041102-1/main.c
-===================================================================
---- fbtest-20041102-1.orig/main.c
-+++ fbtest-20041102-1/main.c
-@@ -13,6 +13,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
-
- #include "types.h"
- #include "util.h"
-@@ -28,6 +29,7 @@
- const char *ProgramName;
-
- const char *Opt_Fbdev = DEFAULT_FBDEV;
-+unsigned long page_mask;
- int Opt_Debug = 0;
- int Opt_List = 0;
- int Opt_Quiet = 0;
-@@ -73,6 +75,7 @@ static void SigHandler(int signo)
-
- int main(int argc, char *argv[])
- {
-+ page_mask = ~(sysconf(_SC_PAGE_SIZE)-1);
- ProgramName = argv[0];
-
- while (argc > 1 && argv[1][0] == '-') {
diff --git a/patches/fbtest-20041102-1/fbtest-20041102-1-penguin.diff b/patches/fbtest-20041102-1/fbtest-20041102-1-penguin.diff
deleted file mode 100644
index 6efe573..0000000
--- a/patches/fbtest-20041102-1/fbtest-20041102-1-penguin.diff
+++ /dev/null
@@ -1,652 +0,0 @@
-From: Sascha Hauer <sha@pengutronix.de>
-Subject: provide a pre-generated penguin.c to get rid of this dependency
-
-fbtest compiles pnmtohex for the host. pnmtohex generates
-penguin.c from penguin.ppm. pnmtohex needs libnetpbm which
-is very painful to compile.
-
-[mkl: added std patch header]
-[mkl: don't delete penguin.c on clean]
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-
----
- Makefile | 2
- images/Makefile | 3
- images/penguin.c | 605 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 606 insertions(+), 4 deletions(-)
-
-Index: fbtest-20041102-1/images/penguin.c
-===================================================================
---- /dev/null
-+++ fbtest-20041102-1/images/penguin.c
-@@ -0,0 +1,605 @@
-+ /*
-+ * Image penguin
-+ */
-+
-+#include "image.h"
-+
-+static const unsigned char penguin_data[];
-+static const unsigned char penguin_clut[];
-+
-+const struct image penguin = {
-+ width: 80,
-+ height: 80,
-+ type: IMAGE_CLUT256,
-+ data: penguin_data,
-+ clut_len: 187,
-+ clut: penguin_clut
-+};
-+
-+static const unsigned char penguin_data[6400] = {
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x01, 0x01, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-+ 0x06, 0x06, 0x05, 0x08, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x09, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x01, 0x03, 0x05, 0x0a, 0x0b, 0x0c, 0x0d, 0x0d, 0x0d, 0x0e, 0x0c, 0x0b,
-+ 0x0a, 0x05, 0x08, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x04, 0x0a, 0x0c, 0x0f,
-+ 0x0c, 0x10, 0x10, 0x04, 0x05, 0x07, 0x0b, 0x0c, 0x0f, 0x11, 0x12, 0x05,
-+ 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x09, 0x09, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x02, 0x05, 0x13, 0x14, 0x15, 0x01, 0x16, 0x16, 0x16, 0x16,
-+ 0x16, 0x16, 0x16, 0x16, 0x01, 0x0b, 0x0f, 0x0c, 0x10, 0x08, 0x01, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x13,
-+ 0x0d, 0x07, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16,
-+ 0x16, 0x16, 0x01, 0x11, 0x0d, 0x12, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x09, 0x09, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x0a, 0x14, 0x05, 0x16, 0x16, 0x16,
-+ 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x03, 0x12, 0x07, 0x01, 0x16,
-+ 0x0a, 0x0d, 0x0a, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x09, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x02, 0x06, 0x0c, 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16,
-+ 0x16, 0x16, 0x16, 0x05, 0x0f, 0x17, 0x12, 0x02, 0x16, 0x15, 0x11, 0x07,
-+ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x09, 0x09, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0a, 0x0f, 0x02,
-+ 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x06,
-+ 0x18, 0x18, 0x15, 0x05, 0x16, 0x01, 0x0d, 0x0b, 0x04, 0x01, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x01, 0x04, 0x19, 0x19, 0x16, 0x16, 0x16, 0x16, 0x16,
-+ 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x05, 0x0b, 0x10, 0x08, 0x02,
-+ 0x16, 0x16, 0x07, 0x14, 0x10, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x09, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-+ 0x06, 0x0d, 0x06, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16,
-+ 0x16, 0x16, 0x16, 0x02, 0x02, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x0d,
-+ 0x13, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x10, 0x0f, 0x03, 0x16,
-+ 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16,
-+ 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x0b, 0x0c, 0x05, 0x01, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x03, 0x0a, 0x14, 0x16, 0x16, 0x16, 0x01, 0x02, 0x16,
-+ 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x01, 0x03, 0x02, 0x16, 0x16,
-+ 0x16, 0x16, 0x16, 0x08, 0x14, 0x07, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-+ 0x12, 0x0f, 0x16, 0x16, 0x01, 0x01, 0x04, 0x07, 0x01, 0x16, 0x16, 0x16,
-+ 0x16, 0x16, 0x08, 0x07, 0x02, 0x13, 0x04, 0x16, 0x16, 0x16, 0x16, 0x02,
-+ 0x0f, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x09, 0x09, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x12, 0x0f, 0x16, 0x16,
-+ 0x10, 0x1a, 0x18, 0x04, 0x04, 0x16, 0x16, 0x16, 0x03, 0x0f, 0x1b, 0x1c,
-+ 0x1d, 0x10, 0x05, 0x01, 0x16, 0x16, 0x16, 0x16, 0x0f, 0x12, 0x03, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x03, 0x12, 0x0f, 0x16, 0x03, 0x1e, 0x1f, 0x20, 0x1a,
-+ 0x02, 0x16, 0x16, 0x01, 0x21, 0x22, 0x23, 0x24, 0x25, 0x1e, 0x03, 0x01,
-+ 0x16, 0x16, 0x16, 0x16, 0x0f, 0x13, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
-+ 0x09, 0x09, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-+ 0x12, 0x0f, 0x16, 0x0b, 0x24, 0x20, 0x26, 0x27, 0x15, 0x16, 0x16, 0x06,
-+ 0x23, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x0e, 0x16, 0x16, 0x16, 0x16, 0x16,
-+ 0x11, 0x15, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x12, 0x14, 0x16, 0x2d,
-+ 0x2e, 0x05, 0x0f, 0x26, 0x2a, 0x02, 0x03, 0x12, 0x2f, 0x30, 0x01, 0x11,
-+ 0x31, 0x32, 0x33, 0x16, 0x16, 0x16, 0x16, 0x16, 0x11, 0x15, 0x04, 0x01,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x09, 0x00, 0x09, 0x09, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x03, 0x0a, 0x0f, 0x01, 0x1a, 0x2d, 0x01, 0x11, 0x34,
-+ 0x35, 0x08, 0x10, 0x0b, 0x2b, 0x2d, 0x16, 0x03, 0x12, 0x30, 0x1f, 0x16,
-+ 0x16, 0x16, 0x16, 0x16, 0x0e, 0x19, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
-+ 0x09, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-+ 0x0a, 0x18, 0x03, 0x17, 0x35, 0x16, 0x08, 0x1a, 0x36, 0x37, 0x37, 0x38,
-+ 0x1c, 0x2d, 0x16, 0x16, 0x16, 0x20, 0x20, 0x01, 0x16, 0x16, 0x16, 0x16,
-+ 0x0e, 0x19, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x09, 0x09, 0x00, 0x09, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x10, 0x31, 0x03, 0x15,
-+ 0x23, 0x05, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x16,
-+ 0x11, 0x27, 0x1b, 0x16, 0x16, 0x16, 0x16, 0x16, 0x11, 0x0c, 0x05, 0x01,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x02, 0x10, 0x0f, 0x03, 0x02, 0x20, 0x42, 0x43, 0x3d,
-+ 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x46, 0x3e, 0x4a, 0x4b, 0x0a, 0x16,
-+ 0x16, 0x16, 0x16, 0x16, 0x13, 0x0e, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
-+ 0x07, 0x0f, 0x03, 0x16, 0x4c, 0x43, 0x4d, 0x44, 0x3c, 0x46, 0x49, 0x4e,
-+ 0x4f, 0x50, 0x51, 0x49, 0x49, 0x52, 0x4c, 0x16, 0x16, 0x16, 0x16, 0x16,
-+ 0x13, 0x14, 0x07, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x07, 0x14, 0x06, 0x53,
-+ 0x54, 0x55, 0x56, 0x44, 0x45, 0x57, 0x49, 0x58, 0x50, 0x51, 0x51, 0x51,
-+ 0x52, 0x3f, 0x3e, 0x01, 0x16, 0x16, 0x16, 0x16, 0x05, 0x18, 0x0a, 0x03,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x02, 0x06, 0x0d, 0x13, 0x59, 0x43, 0x5a, 0x5b, 0x3c,
-+ 0x46, 0x49, 0x4e, 0x5c, 0x51, 0x51, 0x49, 0x5d, 0x5e, 0x5a, 0x5f, 0x16,
-+ 0x16, 0x16, 0x16, 0x16, 0x01, 0x31, 0x0b, 0x08, 0x01, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
-+ 0x06, 0x0d, 0x12, 0x04, 0x60, 0x61, 0x44, 0x62, 0x57, 0x49, 0x51, 0x51,
-+ 0x49, 0x63, 0x64, 0x65, 0x5a, 0x65, 0x66, 0x16, 0x01, 0x0b, 0x03, 0x16,
-+ 0x16, 0x19, 0x0e, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x07, 0x0d, 0x13, 0x01,
-+ 0x67, 0x68, 0x69, 0x52, 0x47, 0x46, 0x3f, 0x69, 0x6a, 0x43, 0x65, 0x6b,
-+ 0x6c, 0x6d, 0x21, 0x16, 0x16, 0x0d, 0x1a, 0x15, 0x16, 0x04, 0x31, 0x12,
-+ 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x02, 0x10, 0x0f, 0x13, 0x01, 0x35, 0x6e, 0x6f, 0x6a,
-+ 0x5d, 0x3e, 0x70, 0x5e, 0x55, 0x55, 0x70, 0x42, 0x20, 0x1f, 0x29, 0x03,
-+ 0x16, 0x04, 0x1a, 0x1a, 0x04, 0x16, 0x0e, 0x11, 0x06, 0x02, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08,
-+ 0x13, 0x17, 0x05, 0x02, 0x1b, 0x30, 0x6e, 0x6f, 0x70, 0x5e, 0x70, 0x43,
-+ 0x54, 0x71, 0x72, 0x22, 0x73, 0x2b, 0x25, 0x0c, 0x16, 0x16, 0x13, 0x19,
-+ 0x01, 0x16, 0x02, 0x31, 0x13, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x07, 0x0e, 0x0e, 0x16, 0x01,
-+ 0x74, 0x1f, 0x30, 0x75, 0x76, 0x6f, 0x6f, 0x77, 0x6e, 0x22, 0x30, 0x23,
-+ 0x27, 0x28, 0x28, 0x78, 0x01, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x19,
-+ 0x0e, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x02, 0x04, 0x0b, 0x18, 0x08, 0x16, 0x12, 0x2c, 0x2b, 0x30, 0x30,
-+ 0x30, 0x22, 0x22, 0x30, 0x30, 0x20, 0x25, 0x79, 0x28, 0x28, 0x28, 0x28,
-+ 0x14, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x03, 0x0f, 0x0b, 0x04, 0x01,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x12, 0x31,
-+ 0x12, 0x08, 0x01, 0x78, 0x28, 0x27, 0x7a, 0x30, 0x30, 0x30, 0x30, 0x30,
-+ 0x7a, 0x2f, 0x7b, 0x28, 0x28, 0x28, 0x28, 0x28, 0x73, 0x03, 0x16, 0x16,
-+ 0x16, 0x16, 0x16, 0x16, 0x0a, 0x0f, 0x0a, 0x08, 0x01, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x01, 0x03, 0x10, 0x0e, 0x0c, 0x16, 0x01, 0x31, 0x7b,
-+ 0x28, 0x28, 0x32, 0x1f, 0x30, 0x30, 0x20, 0x2b, 0x27, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x14, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16,
-+ 0x16, 0x0d, 0x11, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-+ 0x07, 0x0c, 0x0d, 0x01, 0x16, 0x08, 0x24, 0x28, 0x28, 0x28, 0x28, 0x27,
-+ 0x26, 0x2f, 0x27, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x7c, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x08, 0x31, 0x19,
-+ 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x05, 0x15, 0x31, 0x08, 0x16,
-+ 0x16, 0x7d, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x7b, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2f, 0x08, 0x16,
-+ 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x08, 0x18, 0x0b, 0x05, 0x02, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x01, 0x04, 0x13, 0x31, 0x05, 0x16, 0x16, 0x03, 0x20, 0x7b, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x7b, 0x79, 0x0b, 0x16, 0x16, 0x16, 0x16, 0x16,
-+ 0x16, 0x16, 0x16, 0x10, 0x0f, 0x13, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x10, 0x14,
-+ 0x07, 0x16, 0x16, 0x16, 0x0a, 0x20, 0x27, 0x28, 0x28, 0x28, 0x28, 0x7b,
-+ 0x79, 0x79, 0x7b, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x7b, 0x27, 0x32,
-+ 0x26, 0x2f, 0x17, 0x01, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16,
-+ 0x10, 0x14, 0x0a, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x02, 0x05, 0x19, 0x0c, 0x16, 0x16, 0x16, 0x01,
-+ 0x11, 0x2e, 0x7a, 0x2c, 0x27, 0x7b, 0x7b, 0x32, 0x26, 0x2f, 0x32, 0x7b,
-+ 0x7b, 0x7b, 0x27, 0x2f, 0x25, 0x7a, 0x73, 0x73, 0x1f, 0x73, 0x78, 0x08,
-+ 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x19, 0x0c, 0x06,
-+ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x03, 0x0a, 0x14, 0x08, 0x16, 0x16, 0x16, 0x02, 0x18, 0x78, 0x24, 0x79,
-+ 0x7b, 0x28, 0x28, 0x7b, 0x2c, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x27,
-+ 0x32, 0x26, 0x23, 0x73, 0x20, 0x20, 0x23, 0x33, 0x01, 0x03, 0x13, 0x03,
-+ 0x16, 0x16, 0x16, 0x16, 0x16, 0x01, 0x0f, 0x12, 0x08, 0x01, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x0b, 0x11, 0x16,
-+ 0x16, 0x02, 0x16, 0x04, 0x7e, 0x2f, 0x7b, 0x28, 0x28, 0x28, 0x28, 0x7b,
-+ 0x79, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x27,
-+ 0x2f, 0x7a, 0x1f, 0x26, 0x18, 0x16, 0x01, 0x10, 0x06, 0x16, 0x16, 0x16,
-+ 0x16, 0x16, 0x19, 0x0c, 0x05, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x02, 0x06, 0x0e, 0x13, 0x16, 0x05, 0x05, 0x16, 0x2d,
-+ 0x32, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x27, 0x24, 0x73,
-+ 0x23, 0x03, 0x16, 0x16, 0x06, 0x04, 0x16, 0x16, 0x16, 0x16, 0x08, 0x0f,
-+ 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
-+ 0x0a, 0x31, 0x04, 0x16, 0x0a, 0x16, 0x08, 0x24, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x7b, 0x2b, 0x24, 0x17, 0x16, 0x03,
-+ 0x08, 0x10, 0x02, 0x16, 0x16, 0x16, 0x16, 0x0d, 0x15, 0x04, 0x01, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x0b, 0x14, 0x16, 0x05,
-+ 0x04, 0x16, 0x2a, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x7b, 0x32, 0x1f, 0x01, 0x10, 0x15, 0x05, 0x10, 0x16,
-+ 0x16, 0x16, 0x16, 0x12, 0x0d, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x02, 0x06, 0x0e, 0x15, 0x16, 0x0a, 0x16, 0x04, 0x2f, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x7b, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x27, 0x12, 0x10, 0x0a, 0x03, 0x10, 0x03, 0x16, 0x16, 0x16, 0x01,
-+ 0x0f, 0x12, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x0a,
-+ 0x31, 0x08, 0x08, 0x05, 0x16, 0x1a, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x7b, 0x32, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x18, 0x01,
-+ 0x16, 0x16, 0x02, 0x07, 0x16, 0x16, 0x16, 0x16, 0x0e, 0x15, 0x04, 0x01,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x05, 0x0c, 0x14, 0x16, 0x10, 0x01,
-+ 0x03, 0x23, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x27, 0x79,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x74, 0x16, 0x16, 0x16, 0x16, 0x12,
-+ 0x16, 0x16, 0x16, 0x16, 0x0a, 0x0e, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x01, 0x03, 0x0a, 0x31, 0x05, 0x01, 0x0a, 0x16, 0x0e, 0x7b, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x79, 0x79, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x78, 0x16, 0x16, 0x16, 0x16, 0x12, 0x16, 0x16, 0x16, 0x16,
-+ 0x02, 0x0f, 0x10, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x05, 0x0c, 0x14,
-+ 0x16, 0x04, 0x08, 0x16, 0x34, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x2c, 0x79, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x7a, 0x16,
-+ 0x16, 0x16, 0x16, 0x10, 0x16, 0x16, 0x16, 0x16, 0x01, 0x0f, 0x12, 0x03,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x01, 0x08, 0x12, 0x0f, 0x08, 0x16, 0x07, 0x02, 0x01,
-+ 0x23, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2c, 0x79,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2b, 0x01, 0x16, 0x16, 0x01, 0x06,
-+ 0x16, 0x16, 0x16, 0x16, 0x16, 0x14, 0x0b, 0x08, 0x01, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
-+ 0x05, 0x0c, 0x19, 0x16, 0x16, 0x10, 0x02, 0x05, 0x32, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2f, 0x32, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x2f, 0x01, 0x16, 0x16, 0x02, 0x06, 0x16, 0x16, 0x16, 0x16,
-+ 0x16, 0x0c, 0x15, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x10, 0x0d, 0x01, 0x16,
-+ 0x16, 0x12, 0x03, 0x0a, 0x27, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x2f, 0x79, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2c, 0x02,
-+ 0x16, 0x16, 0x04, 0x03, 0x16, 0x16, 0x16, 0x16, 0x16, 0x0c, 0x19, 0x04,
-+ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x01, 0x08, 0x13, 0x0e, 0x16, 0x16, 0x03, 0x11, 0x07, 0x19,
-+ 0x7b, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2f, 0x27,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2c, 0x03, 0x16, 0x16, 0x06, 0x16,
-+ 0x16, 0x16, 0x16, 0x16, 0x16, 0x0c, 0x19, 0x04, 0x01, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08,
-+ 0x0b, 0x19, 0x16, 0x16, 0x16, 0x06, 0x12, 0x11, 0x7b, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2f, 0x27, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x26, 0x02, 0x16, 0x01, 0x06, 0x16, 0x16, 0x16, 0x16, 0x16,
-+ 0x16, 0x0c, 0x15, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x15, 0x19, 0x16, 0x16,
-+ 0x16, 0x16, 0x06, 0x0d, 0x7b, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x2f, 0x27, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x7a, 0x16,
-+ 0x04, 0x07, 0x7f, 0x04, 0x05, 0x08, 0x01, 0x16, 0x16, 0x14, 0x0b, 0x08,
-+ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x01, 0x05, 0x19, 0x2d, 0x80, 0x64, 0x61, 0x37, 0x01, 0x19,
-+ 0x32, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2f, 0x27,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x33, 0x08, 0x03, 0x16, 0x16, 0x16,
-+ 0x01, 0x08, 0x0c, 0x10, 0x01, 0x18, 0x13, 0x08, 0x01, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x08, 0x10,
-+ 0x0d, 0x81, 0x5a, 0x82, 0x83, 0x83, 0x5f, 0x02, 0x31, 0x32, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2f, 0x7b, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x84,
-+ 0x85, 0x85, 0x86, 0x41, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x10, 0x12,
-+ 0x05, 0x2d, 0x0b, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x01, 0x03, 0x04, 0x06, 0x10, 0x13, 0x11, 0x2d, 0x71, 0x3b, 0x82,
-+ 0x83, 0x83, 0x83, 0x3a, 0x01, 0x0e, 0x26, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x2f, 0x7b, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x87, 0x88, 0x49, 0x46, 0x89,
-+ 0x16, 0x16, 0x16, 0x16, 0x16, 0x01, 0x06, 0x05, 0x63, 0x8a, 0x0c, 0x05,
-+ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x10, 0x15,
-+ 0x0d, 0x0f, 0x17, 0x2a, 0x40, 0x65, 0x8b, 0x8c, 0x83, 0x83, 0x83, 0x62,
-+ 0x66, 0x16, 0x12, 0x1f, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2c, 0x79,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x8d, 0x82, 0x88, 0x8e, 0x8f, 0x16, 0x16, 0x16, 0x16,
-+ 0x16, 0x16, 0x01, 0x37, 0x57, 0x46, 0x14, 0x07, 0x02, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x03, 0x10, 0x11, 0x90, 0x71, 0x5e, 0x70, 0x70,
-+ 0x6b, 0x3b, 0x82, 0x83, 0x83, 0x83, 0x83, 0x83, 0x3d, 0x91, 0x16, 0x04,
-+ 0x33, 0x7b, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x7b, 0x79, 0x8d,
-+ 0x44, 0x3c, 0x6b, 0x91, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x53, 0x3d,
-+ 0x62, 0x3c, 0x92, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-+ 0x04, 0x0b, 0x90, 0x6b, 0x3b, 0x56, 0x3b, 0x3b, 0x5b, 0x82, 0x83, 0x83,
-+ 0x83, 0x83, 0x83, 0x83, 0x88, 0x3e, 0x02, 0x16, 0x01, 0x1a, 0x79, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x2f, 0x1f, 0x93, 0x5b, 0x5b, 0x65, 0x60,
-+ 0x7f, 0x16, 0x16, 0x16, 0x01, 0x94, 0x5e, 0x5b, 0x44, 0x44, 0x95, 0x15,
-+ 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x11, 0x96, 0x3b,
-+ 0x44, 0x82, 0x82, 0x8c, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
-+ 0x83, 0x46, 0x97, 0x16, 0x16, 0x16, 0x0c, 0x2b, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x7a, 0x1f, 0x98, 0x56, 0x56, 0x5a, 0x43, 0x99, 0x9a, 0x66, 0x9a,
-+ 0x9b, 0x70, 0x3b, 0x44, 0x82, 0x82, 0x9c, 0x0d, 0x07, 0x03, 0x01, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x01, 0x06, 0x0d, 0x71, 0x3b, 0x44, 0x83, 0x83, 0x83,
-+ 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x88, 0x63, 0x8f,
-+ 0x16, 0x16, 0x16, 0x10, 0x24, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x7b, 0x7a, 0x1f, 0x9d,
-+ 0x3b, 0x5b, 0x9e, 0x65, 0x5e, 0x70, 0x43, 0x70, 0x65, 0x3b, 0x82, 0x83,
-+ 0x83, 0x8c, 0x3d, 0x95, 0x19, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
-+ 0x06, 0x0d, 0x9f, 0x9e, 0x44, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
-+ 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x88, 0x68, 0x16, 0x16, 0x16, 0x16,
-+ 0x0d, 0x7b, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x7b, 0x25, 0x1f, 0xa0, 0x4d, 0x5b, 0x8b, 0x9e,
-+ 0x5a, 0x6b, 0x6b, 0x5a, 0x3b, 0x44, 0x83, 0x83, 0x83, 0x83, 0x82, 0xa1,
-+ 0x17, 0x15, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x0e, 0x9f, 0x5a,
-+ 0x5b, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
-+ 0x83, 0x83, 0x88, 0x52, 0x53, 0x16, 0x16, 0x16, 0x04, 0x32, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x26, 0x22, 0x96, 0x5a, 0x5b, 0x44, 0x5b, 0x56, 0x3b, 0x3b, 0x56,
-+ 0x5b, 0x82, 0x83, 0x83, 0x83, 0x83, 0x8c, 0x44, 0xa1, 0x2d, 0x0c, 0x07,
-+ 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x01, 0x05, 0x11, 0xa2, 0x6b, 0x5b, 0x83, 0x83, 0x83,
-+ 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x88,
-+ 0x69, 0x7f, 0x16, 0x16, 0x12, 0x27, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2b, 0x0f, 0x6f,
-+ 0x5a, 0x5b, 0x82, 0x8c, 0x82, 0x44, 0x44, 0x82, 0x82, 0x8c, 0x83, 0x83,
-+ 0x83, 0x83, 0x83, 0x83, 0x82, 0x3d, 0xa3, 0x0c, 0x06, 0x02, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-+ 0x05, 0x11, 0xa2, 0x65, 0x5b, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
-+ 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x46, 0x37, 0x07, 0x2d,
-+ 0x2b, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x79, 0x14, 0x7f, 0x99, 0x5a, 0x5b, 0x82, 0x83,
-+ 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
-+ 0x83, 0x83, 0x82, 0xa2, 0x12, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x0d, 0xa2, 0x65,
-+ 0x5b, 0x8c, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
-+ 0x83, 0x83, 0x83, 0x83, 0x88, 0x3f, 0x72, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x24,
-+ 0x15, 0x16, 0x8f, 0x9b, 0x5a, 0x5b, 0x8c, 0x83, 0x83, 0x83, 0x83, 0x83,
-+ 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x8c, 0x82, 0xa0,
-+ 0x0b, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x03, 0x10, 0x0f, 0x96, 0x6b, 0x5b, 0x8c, 0x83, 0x83,
-+ 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
-+ 0x83, 0x46, 0x69, 0x25, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x28, 0x28, 0x28, 0x28, 0x28, 0x7b, 0x2e, 0x05, 0x16, 0x16, 0x41, 0x99,
-+ 0x4d, 0x44, 0x8c, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
-+ 0x83, 0x83, 0x83, 0x83, 0x8c, 0x5b, 0x9e, 0xa3, 0x12, 0x08, 0x01, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08,
-+ 0x13, 0xa4, 0x43, 0x9e, 0x82, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
-+ 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x82, 0x52, 0x61, 0xa5,
-+ 0x26, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
-+ 0x1f, 0x0c, 0x16, 0x16, 0x16, 0x16, 0xa6, 0x6f, 0x4d, 0x44, 0x8c, 0x83,
-+ 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x82,
-+ 0x8b, 0x6b, 0x90, 0x0c, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x15, 0x76, 0x55, 0x8b,
-+ 0x82, 0x8c, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
-+ 0x83, 0x83, 0x83, 0x83, 0x8c, 0x5b, 0x61, 0x99, 0x53, 0x1b, 0x24, 0x7b,
-+ 0x28, 0x28, 0x28, 0x7b, 0x79, 0x23, 0x74, 0x0c, 0x01, 0x16, 0x16, 0x16,
-+ 0x16, 0x16, 0x53, 0x99, 0x5a, 0x5b, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
-+ 0x83, 0x83, 0x83, 0x83, 0x83, 0x44, 0x56, 0x5a, 0x71, 0x95, 0x11, 0x10,
-+ 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x01, 0x04, 0x19, 0x77, 0x55, 0x9e, 0x5b, 0x44, 0x82, 0x82,
-+ 0x8c, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
-+ 0x83, 0x5b, 0x5a, 0xa7, 0xa8, 0x16, 0x01, 0x06, 0x0b, 0x19, 0x13, 0x10,
-+ 0x03, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x01, 0xa8, 0x9b,
-+ 0x6b, 0x5b, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x82, 0x44, 0x44,
-+ 0x56, 0x65, 0x9f, 0x95, 0x14, 0x0b, 0x07, 0x08, 0x01, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08,
-+ 0x13, 0xa9, 0x43, 0x5e, 0x5a, 0x4d, 0x9e, 0x3b, 0x56, 0x5b, 0x44, 0x44,
-+ 0x82, 0x8c, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x8c, 0x56, 0x65, 0x99,
-+ 0x59, 0x02, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16,
-+ 0x16, 0x16, 0x16, 0x16, 0x16, 0x01, 0xaa, 0x9b, 0x55, 0x56, 0x82, 0x83,
-+ 0x83, 0x83, 0x8c, 0x82, 0x44, 0x56, 0x9e, 0x6b, 0x96, 0x95, 0x0f, 0x15,
-+ 0x10, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x11, 0xab, 0xa9,
-+ 0x9b, 0x54, 0x43, 0x70, 0x5e, 0x55, 0x6b, 0x4d, 0x9e, 0x56, 0x44, 0x82,
-+ 0x8c, 0x8c, 0x8c, 0x8c, 0x44, 0x5a, 0x64, 0xac, 0x59, 0x7f, 0x16, 0x16,
-+ 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16,
-+ 0x16, 0x01, 0xa8, 0xac, 0x43, 0x4d, 0x5b, 0x44, 0x8c, 0x82, 0x44, 0x5b,
-+ 0x9e, 0x55, 0x43, 0x76, 0x18, 0x19, 0x0a, 0x04, 0x03, 0x01, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x01, 0x08, 0x07, 0x15, 0x0d, 0x21, 0x95, 0xa5, 0x6f,
-+ 0x99, 0x9b, 0xa7, 0x54, 0x64, 0x70, 0x65, 0x4d, 0x3b, 0x5b, 0x5b, 0x8b,
-+ 0x4d, 0x70, 0x99, 0xad, 0xaa, 0x02, 0x16, 0x16, 0x08, 0x10, 0x10, 0x10,
-+ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x05, 0x16, 0x16, 0x01, 0x94, 0x60,
-+ 0xa7, 0x5e, 0x4d, 0x56, 0x8b, 0x56, 0x4d, 0x65, 0x43, 0x99, 0x95, 0x14,
-+ 0x13, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x01, 0x03, 0x04, 0x07, 0x0a, 0x15, 0x0e, 0x0f, 0x21, 0xae, 0xaf, 0x4c,
-+ 0x60, 0xac, 0x99, 0x54, 0x64, 0x70, 0x55, 0x5e, 0x54, 0x6f, 0xad, 0x59,
-+ 0xa6, 0x0b, 0x7d, 0x21, 0x0f, 0x14, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d,
-+ 0x0d, 0x14, 0x0f, 0x18, 0x2d, 0x17, 0xb0, 0xb1, 0x6f, 0x54, 0x43, 0x5e,
-+ 0x55, 0x5e, 0x43, 0xa7, 0x68, 0xa4, 0x11, 0x0a, 0x04, 0x02, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02,
-+ 0x03, 0x04, 0x06, 0x10, 0x13, 0x19, 0x0e, 0x31, 0x21, 0x92, 0x4c, 0xb1,
-+ 0x60, 0xac, 0xac, 0xac, 0xb2, 0xb1, 0x97, 0xb3, 0x21, 0x14, 0x15, 0x12,
-+ 0x10, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x10, 0x0a,
-+ 0x0b, 0x14, 0xb4, 0xaa, 0xb5, 0x6f, 0x9b, 0xa7, 0xa7, 0x9b, 0xac, 0x4c,
-+ 0x21, 0x19, 0x07, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02,
-+ 0x08, 0x04, 0x06, 0x0a, 0x13, 0x0c, 0x0f, 0x21, 0xb6, 0x97, 0x59, 0x59,
-+ 0x59, 0xaa, 0xb7, 0x31, 0x19, 0x10, 0x04, 0x03, 0x02, 0x02, 0x02, 0x02,
-+ 0x02, 0x02, 0x01, 0x02, 0x02, 0x02, 0x02, 0x03, 0x04, 0x0a, 0x11, 0xb8,
-+ 0xa8, 0x59, 0xb1, 0x60, 0xb5, 0x9a, 0xb9, 0x0f, 0x15, 0x06, 0x03, 0x01,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03,
-+ 0x08, 0x05, 0x10, 0x0b, 0x11, 0x0f, 0xb4, 0xb8, 0xb8, 0x0f, 0x0e, 0x13,
-+ 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x07, 0x15, 0x14, 0xb8, 0xb8, 0xb8,
-+ 0xba, 0xb4, 0x0e, 0x13, 0x05, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x08,
-+ 0x06, 0x10, 0x12, 0x0b, 0x13, 0x0a, 0x06, 0x08, 0x02, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x01, 0x03, 0x05, 0x10, 0x13, 0x15, 0x15, 0x0b, 0x0a, 0x06, 0x08,
-+ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x03, 0x08,
-+ 0x08, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-+ 0x03, 0x08, 0x04, 0x04, 0x08, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00,
-+};
-+
-+static const unsigned char penguin_clut[561] = {
-+ 0x00, 0x00, 0x00, 0x06, 0x06, 0x06, 0x0a, 0x0a, 0x0a, 0x0e, 0x0e, 0x0e,
-+ 0x16, 0x16, 0x16, 0x1a, 0x1a, 0x1a, 0x1e, 0x1e, 0x1e, 0x22, 0x22, 0x22,
-+ 0x12, 0x12, 0x12, 0x00, 0x00, 0x01, 0x2a, 0x2a, 0x2a, 0x36, 0x36, 0x36,
-+ 0x42, 0x42, 0x42, 0x4e, 0x4e, 0x4e, 0x4a, 0x4a, 0x4a, 0x56, 0x56, 0x56,
-+ 0x26, 0x26, 0x26, 0x46, 0x46, 0x46, 0x2e, 0x2e, 0x2e, 0x32, 0x32, 0x32,
-+ 0x52, 0x52, 0x52, 0x3a, 0x3a, 0x3a, 0x02, 0x02, 0x06, 0x65, 0x65, 0x65,
-+ 0x5e, 0x5e, 0x5e, 0x3e, 0x3e, 0x3e, 0x74, 0x74, 0x74, 0x8a, 0x8a, 0x8a,
-+ 0xa2, 0xa2, 0xa2, 0x9a, 0x9a, 0x9a, 0x86, 0x86, 0x86, 0xc6, 0xc6, 0xc6,
-+ 0xc3, 0xc3, 0xc3, 0x65, 0x62, 0x59, 0xbb, 0xbb, 0xbb, 0xd2, 0xd2, 0xd2,
-+ 0xda, 0xda, 0xda, 0xd6, 0xd6, 0xd6, 0xe2, 0xe2, 0xe2, 0xf6, 0xf6, 0xf6,
-+ 0xfd, 0xfd, 0xfd, 0xae, 0xae, 0xae, 0x7b, 0x7b, 0x7b, 0xdd, 0xdd, 0xdd,
-+ 0xea, 0xea, 0xea, 0x6a, 0x6a, 0x6a, 0xaa, 0xaa, 0xaa, 0xe7, 0xe7, 0xe7,
-+ 0xbe, 0xbe, 0xbe, 0x5a, 0x5a, 0x5a, 0xee, 0xee, 0xee, 0x9e, 0x9e, 0x9e,
-+ 0x95, 0x95, 0x95, 0x80, 0x80, 0x80, 0x76, 0x62, 0x2e, 0x79, 0x5c, 0x08,
-+ 0x62, 0x4e, 0x0a, 0x36, 0x26, 0x06, 0x9a, 0x72, 0x0a, 0xe2, 0xaa, 0x0b,
-+ 0xec, 0xba, 0x0b, 0xe1, 0xaf, 0x0f, 0xb8, 0x90, 0x0c, 0xd7, 0xae, 0x0f,
-+ 0xaf, 0x92, 0x3d, 0x25, 0x1a, 0x09, 0xbc, 0xa4, 0x73, 0xc0, 0x85, 0x09,
-+ 0xef, 0xb6, 0x0d, 0xea, 0xbe, 0x0a, 0xe8, 0xc3, 0x10, 0xe8, 0xc8, 0x1e,
-+ 0xf5, 0xcf, 0x2d, 0xf1, 0xd0, 0x13, 0xda, 0xc2, 0x86, 0xd3, 0xce, 0xba,
-+ 0x79, 0x57, 0x19, 0xdb, 0xa2, 0x0a, 0xf4, 0xd6, 0x36, 0xf6, 0xda, 0x3c,
-+ 0xf6, 0xda, 0x26, 0xf6, 0xd7, 0x14, 0xe2, 0xb8, 0x0d, 0x3d, 0x2a, 0x06,
-+ 0xb4, 0x7b, 0x07, 0xce, 0x91, 0x0a, 0xe6, 0xae, 0x0b, 0xee, 0xca, 0x0f,
-+ 0xf6, 0xda, 0x4a, 0x68, 0x45, 0x06, 0xd8, 0x9e, 0x0a, 0xec, 0xb2, 0x0c,
-+ 0xf5, 0xd7, 0x2b, 0xc6, 0x9b, 0x0a, 0xc8, 0x90, 0x0b, 0x9c, 0x76, 0x0a,
-+ 0x89, 0x5c, 0x06, 0xd2, 0xa2, 0x0a, 0xee, 0xbe, 0x0a, 0xcb, 0xa6, 0x11,
-+ 0xb9, 0x85, 0x0b, 0xd2, 0x96, 0x0a, 0x66, 0x4e, 0x0a, 0x5e, 0x46, 0x1e,
-+ 0x8b, 0x66, 0x0f, 0xbe, 0x92, 0x0d, 0xa8, 0x7a, 0x0a, 0xd5, 0x9a, 0x0b,
-+ 0xca, 0x96, 0x22, 0xb6, 0x9d, 0x6a, 0xae, 0x9a, 0x72, 0x9c, 0x6b, 0x0b,
-+ 0xc5, 0x8a, 0x0b, 0xbe, 0x8e, 0x22, 0xbe, 0xb2, 0x90, 0xca, 0xca, 0xca,
-+ 0x90, 0x90, 0x90, 0xb2, 0xa6, 0x92, 0x9a, 0x79, 0x3c, 0xa8, 0x7c, 0x2c,
-+ 0xb6, 0xb6, 0xb6, 0xf2, 0xf2, 0xf2, 0xce, 0xce, 0xce, 0xfa, 0xfa, 0xfa,
-+ 0xb2, 0xb2, 0xb2, 0x6e, 0x6e, 0x6e, 0xa6, 0xa6, 0xa6, 0x12, 0x0e, 0x06,
-+ 0x4a, 0x36, 0x0e, 0x8e, 0x86, 0x6a, 0xf2, 0xba, 0x0e, 0xf6, 0xbe, 0x0e,
-+ 0xf6, 0xe6, 0xbe, 0xee, 0xcc, 0x5b, 0xb5, 0x8e, 0x2c, 0xe4, 0xb8, 0x3e,
-+ 0xf1, 0xc4, 0x0e, 0x26, 0x1e, 0x0a, 0x9a, 0x8e, 0x5a, 0xea, 0xae, 0x0d,
-+ 0xf6, 0xba, 0x0e, 0xe0, 0xb2, 0x3e, 0xd2, 0xa6, 0x0a, 0x16, 0x12, 0x06,
-+ 0x9a, 0x7a, 0x2e, 0x2e, 0x20, 0x06, 0x70, 0x64, 0x4e, 0xd6, 0xaa, 0x36,
-+ 0x46, 0x2f, 0x06, 0x7c, 0x70, 0x58, 0xb4, 0x85, 0x24, 0x62, 0x46, 0x06,
-+ 0xd6, 0xa6, 0x3a, 0xa3, 0x6e, 0x08, 0x74, 0x51, 0x08, 0xa7, 0x72, 0x07,
-+ 0xa2, 0x92, 0x5e, 0xca, 0xa2, 0x45, 0xe0, 0xa6, 0x0a, 0xae, 0x87, 0x32,
-+ 0xbe, 0x96, 0x2e, 0xce, 0xa2, 0x2a, 0xa3, 0x85, 0x43, 0x8e, 0x7a, 0x48,
-+ 0x6d, 0x6a, 0x5f, 0x8e, 0x6e, 0x2e, 0x32, 0x22, 0x06, 0xaf, 0x76, 0x06,
-+ 0x50, 0x36, 0x07, 0x9e, 0x76, 0x24, 0x5b, 0x3c, 0x06, 0x8a, 0x6e, 0x32,
-+ 0x98, 0x63, 0x06, 0x82, 0x53, 0x06, 0x7a, 0x66, 0x46, 0x82, 0x62, 0x2e,
-+ 0x56, 0x42, 0x22, 0x7c, 0x50, 0x06, 0x8a, 0x56, 0x06, 0x56, 0x42, 0x1e,
-+ 0x5e, 0x56, 0x4c, 0x86, 0x56, 0x06, 0x6a, 0x56, 0x3a, 0x52, 0x3e, 0x22,
-+ 0x59, 0x51, 0x42, 0x64, 0x52, 0x34, 0x5e, 0x56, 0x42,
-+};
-+
-Index: fbtest-20041102-1/Makefile
-===================================================================
---- fbtest-20041102-1.orig/Makefile
-+++ fbtest-20041102-1/Makefile
-@@ -6,7 +6,7 @@ TARGET = $(CROSS_COMPILE)fbtest
- OBJS += drawops/drawops.o fonts/fonts.o images/images.o visops/visops.o \
- tests/tests.o
-
--SUBDIRS = drawops pnmtohex fonts images visops tests
-+SUBDIRS = drawops fonts images visops tests
-
- include $(TOPDIR)/Rules.make
-
-Index: fbtest-20041102-1/images/Makefile
-===================================================================
---- fbtest-20041102-1.orig/images/Makefile
-+++ fbtest-20041102-1/images/Makefile
-@@ -19,6 +19,3 @@ include $(TOPDIR)/Rules.make
- %.c: %.pnm
- ../pnmtohex/pnmtohex $< $* > $@
-
--clean::
-- $(RM) $(SRCS)
--
diff --git a/patches/fbtest-20041102-1/series b/patches/fbtest-20041102-1/series
deleted file mode 100644
index 5645c3f..0000000
--- a/patches/fbtest-20041102-1/series
+++ /dev/null
@@ -1,5 +0,0 @@
-fbtest-20041102-1-penguin.diff
-fbtest-20041102-1-nowerror.diff
-fbtest-20041102-1-optimize-O2.diff
-fbtest-20041102-1-page_mask.diff
-fbtest-20041102-1-add-make-install.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 23/28] font-alias: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (20 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 22/28] fbtest: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 24/28] freetype: " Robert Schwebel
` (4 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
...-variable-to-100dpi-and-75dpi-fonts.alias.patch | 53 ++++++++++++++++++++
.../font-alias-1.0.3/alias_variable_font_dir.diff | 48 ------------------
patches/font-alias-1.0.3/series | 1 -
3 files changed, 53 insertions(+), 49 deletions(-)
create mode 100644 patches/font-alias-1.0.3/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch
delete mode 100644 patches/font-alias-1.0.3/alias_variable_font_dir.diff
delete mode 100644 patches/font-alias-1.0.3/series
diff --git a/patches/font-alias-1.0.3/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch b/patches/font-alias-1.0.3/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch
new file mode 100644
index 0000000..488ec02
--- /dev/null
+++ b/patches/font-alias-1.0.3/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch
@@ -0,0 +1,53 @@
+From d2d0e26f3e6e84db4527d35ca53cfbb0781d1333 Mon Sep 17 00:00:00 2001
+From: Luotao Fu <l.fu@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:24:59 +0100
+Subject: [PATCH] add 'variable' to 100dpi and 75dpi fonts.alias
+
+The "variable" font point to helvectica, which only exists in 75dpi and
+100dpi directories. Hence if an application queries for that variable it
+may fail.
+
+The font package mechanism is complicated, since directory structure on
+the installation target is often not synchronic with the order of the font
+packages. Various distributions solve this problem differently. Question
+to mainline has yet received no answer.
+
+Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
+---
+ 100dpi/fonts.alias | 1 +
+ 75dpi/fonts.alias | 1 +
+ misc/fonts.alias | 1 -
+ 3 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/100dpi/fonts.alias b/100dpi/fonts.alias
+index 9a4c461..9c5aa7b 100644
+--- a/100dpi/fonts.alias
++++ b/100dpi/fonts.alias
+@@ -1,3 +1,4 @@
++variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1
+ lucidasans-bolditalic-8 -b&h-lucida-bold-i-normal-sans-11-80-100-100-p-69-iso8859-1
+ lucidasans-bolditalic-10 -b&h-lucida-bold-i-normal-sans-14-100-100-100-p-90-iso8859-1
+ lucidasans-bolditalic-12 -b&h-lucida-bold-i-normal-sans-17-120-100-100-p-108-iso8859-1
+diff --git a/75dpi/fonts.alias b/75dpi/fonts.alias
+index a3d464f..c3f9dd1 100644
+--- a/75dpi/fonts.alias
++++ b/75dpi/fonts.alias
+@@ -1,3 +1,4 @@
++variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1
+ lucidasans-bolditalic-8 -b&h-lucida-bold-i-normal-sans-8-80-75-75-p-49-iso8859-1
+ lucidasans-bolditalic-10 -b&h-lucida-bold-i-normal-sans-10-100-75-75-p-67-iso8859-1
+ lucidasans-bolditalic-12 -b&h-lucida-bold-i-normal-sans-12-120-75-75-p-79-iso8859-1
+diff --git a/misc/fonts.alias b/misc/fonts.alias
+index 0398476..d4c49f2 100644
+--- a/misc/fonts.alias
++++ b/misc/fonts.alias
+@@ -1,6 +1,5 @@
+ ! $Xorg: fonts.alias,v 1.3 2000/08/21 16:42:31 coskrey Exp $
+ fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
+-variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1
+ 5x7 -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1
+ 5x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1
+ 6x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1
+--
+1.7.7
+
diff --git a/patches/font-alias-1.0.3/alias_variable_font_dir.diff b/patches/font-alias-1.0.3/alias_variable_font_dir.diff
deleted file mode 100644
index f78811c..0000000
--- a/patches/font-alias-1.0.3/alias_variable_font_dir.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Luotao Fu <l.fu@pengutronix.de>
-Subject: [patch] add 'variable' to 100dpi and 75dpi fonts.alias
-
-The "variable" font point to helvectica, which only exists in 75dpi and
-100dpi directories. Hence if an application queries for that variable it
-may fail.
-
-The font package mechanism is complicated, since directory structure on
-the installation target is often not synchronic with the order of the font
-packages. Various distributions solve this problem differently. Question
-to mainline has yet received no answer.
-
-Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
----
- 100dpi/fonts.alias | 1 +
- 75dpi/fonts.alias | 1 +
- misc/fonts.alias | 1 -
- 3 files changed, 2 insertions(+), 1 deletion(-)
-
-Index: font-alias-X11R7.0-1.0.1/100dpi/fonts.alias
-===================================================================
---- font-alias-X11R7.0-1.0.1.orig/100dpi/fonts.alias
-+++ font-alias-X11R7.0-1.0.1/100dpi/fonts.alias
-@@ -1,3 +1,4 @@
-+variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1
- lucidasans-bolditalic-8 -b&h-lucida-bold-i-normal-sans-11-80-100-100-p-69-iso8859-1
- lucidasans-bolditalic-10 -b&h-lucida-bold-i-normal-sans-14-100-100-100-p-90-iso8859-1
- lucidasans-bolditalic-12 -b&h-lucida-bold-i-normal-sans-17-120-100-100-p-108-iso8859-1
-Index: font-alias-X11R7.0-1.0.1/75dpi/fonts.alias
-===================================================================
---- font-alias-X11R7.0-1.0.1.orig/75dpi/fonts.alias
-+++ font-alias-X11R7.0-1.0.1/75dpi/fonts.alias
-@@ -1,3 +1,4 @@
-+variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1
- lucidasans-bolditalic-8 -b&h-lucida-bold-i-normal-sans-8-80-75-75-p-49-iso8859-1
- lucidasans-bolditalic-10 -b&h-lucida-bold-i-normal-sans-10-100-75-75-p-67-iso8859-1
- lucidasans-bolditalic-12 -b&h-lucida-bold-i-normal-sans-12-120-75-75-p-79-iso8859-1
-Index: font-alias-X11R7.0-1.0.1/misc/fonts.alias
-===================================================================
---- font-alias-X11R7.0-1.0.1.orig/misc/fonts.alias
-+++ font-alias-X11R7.0-1.0.1/misc/fonts.alias
-@@ -1,6 +1,5 @@
- ! $Xorg: fonts.alias,v 1.3 2000/08/21 16:42:31 coskrey Exp $
- fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
--variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1
- 5x7 -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1
- 5x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1
- 6x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1
diff --git a/patches/font-alias-1.0.3/series b/patches/font-alias-1.0.3/series
deleted file mode 100644
index 23239fd..0000000
--- a/patches/font-alias-1.0.3/series
+++ /dev/null
@@ -1 +0,0 @@
-alias_variable_font_dir.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 24/28] freetype: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (21 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 23/28] font-alias: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 25/28] glademm: " Robert Schwebel
` (3 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
.../0001-make-freetype-config-SYSROOT-aware.patch | 83 ++++++++++++++++++++
.../builds_unix_freetype-config_in_sysroot.diff | 80 -------------------
patches/freetype-2.3.11/series | 1 -
3 files changed, 83 insertions(+), 81 deletions(-)
create mode 100644 patches/freetype-2.3.11/0001-make-freetype-config-SYSROOT-aware.patch
delete mode 100644 patches/freetype-2.3.11/builds_unix_freetype-config_in_sysroot.diff
delete mode 100644 patches/freetype-2.3.11/series
diff --git a/patches/freetype-2.3.11/0001-make-freetype-config-SYSROOT-aware.patch b/patches/freetype-2.3.11/0001-make-freetype-config-SYSROOT-aware.patch
new file mode 100644
index 0000000..7fb25b8
--- /dev/null
+++ b/patches/freetype-2.3.11/0001-make-freetype-config-SYSROOT-aware.patch
@@ -0,0 +1,83 @@
+From 50860d6517b7b9f12501e1eebdabf1a1971337a6 Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:27:04 +0100
+Subject: [PATCH] make freetype-config $SYSROOT aware
+
+Currently, freetype-config is not $SYSROOT aware, which is fixed by this
+patch.
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ builds/unix/freetype-config.in | 22 +++++++++++-----------
+ 1 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
+index 9606d31..0a7a767 100644
+--- a/builds/unix/freetype-config.in
++++ b/builds/unix/freetype-config.in
+@@ -101,11 +101,11 @@ if test "$local_prefix" = "yes" ; then
+ fi
+
+ if test "$echo_prefix" = "yes" ; then
+- echo $prefix
++ echo ${SYSROOT}$prefix
+ fi
+
+ if test "$echo_exec_prefix" = "yes" ; then
+- echo $exec_prefix
++ echo ${SYSROOT}$exec_prefix
+ fi
+
+ if test "$exec_prefix_set" = "yes" ; then
+@@ -118,22 +118,22 @@ else
+ fi
+
+ if test "$echo_ft_version" = "yes" ; then
+- major=`grep define $includedir/freetype2/freetype/freetype.h \
++ major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+ | grep FREETYPE_MAJOR \
+ | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
+- minor=`grep define $includedir/freetype2/freetype/freetype.h \
++ minor=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+ | grep FREETYPE_MINOR \
+ | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
+- patch=`grep define $includedir/freetype2/freetype/freetype.h \
++ patch=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+ | grep FREETYPE_PATCH \
+ | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
+ echo $major.$minor.$patch
+ fi
+
+ if test "$echo_cflags" = "yes" ; then
+- cflags="-I$includedir/freetype2"
+- if test "$includedir" != "/usr/include" ; then
+- echo $cflags -I$includedir
++ cflags="-I${SYSROOT}$includedir/freetype2"
++ if test "${SYSROOT}$includedir" != "/usr/include" ; then
++ echo $cflags -I${SYSROOT}$includedir
+ else
+ echo $cflags
+ fi
+@@ -145,8 +145,8 @@ if test "$echo_libs" = "yes" ; then
+ eval "rpath=\"$hardcode_libdir_flag_spec\""
+ fi
+ libs="-lfreetype @LIBZ@ @FT2_EXTRA_LIBS@"
+- if test "$libdir" != "/usr/lib" && test "$libdir" != "/usr/lib64"; then
+- echo -L$libdir $rpath $libs
++ if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != "/usr/lib64"; then
++ echo -L${SYSROOT}$libdir $libs
+ else
+ echo $libs
+ fi
+@@ -154,7 +154,7 @@ fi
+
+ if test "$echo_libtool" = "yes" ; then
+ convlib="libfreetype.la"
+- echo $libdir/$convlib
++ echo ${SYSROOT}$libdir/$convlib
+ fi
+
+ # EOF
+--
+1.7.7
+
diff --git a/patches/freetype-2.3.11/builds_unix_freetype-config_in_sysroot.diff b/patches/freetype-2.3.11/builds_unix_freetype-config_in_sysroot.diff
deleted file mode 100644
index 78fa52f..0000000
--- a/patches/freetype-2.3.11/builds_unix_freetype-config_in_sysroot.diff
+++ /dev/null
@@ -1,80 +0,0 @@
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Subject: [patch] make freetype-config $SYSROOT aware
-
-Currently, freetype-config is not $SYSROOT aware, which is fixed by this
-patch.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
-# 20091221 rsc: submitted as https://savannah.nongnu.org/patch/index.php?7040
-
- builds/unix/freetype-config.in | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-Index: freetype-2.3.9/builds/unix/freetype-config.in
-===================================================================
---- freetype-2.3.9.orig/builds/unix/freetype-config.in
-+++ freetype-2.3.9/builds/unix/freetype-config.in
-@@ -101,11 +101,11 @@ if test "$local_prefix" = "yes" ; then
- fi
-
- if test "$echo_prefix" = "yes" ; then
-- echo $prefix
-+ echo ${SYSROOT}$prefix
- fi
-
- if test "$echo_exec_prefix" = "yes" ; then
-- echo $exec_prefix
-+ echo ${SYSROOT}$exec_prefix
- fi
-
- if test "$exec_prefix_set" = "yes" ; then
-@@ -118,22 +118,22 @@ else
- fi
-
- if test "$echo_ft_version" = "yes" ; then
-- major=`grep define $includedir/freetype2/freetype/freetype.h \
-+ major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
- | grep FREETYPE_MAJOR \
- | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
-- minor=`grep define $includedir/freetype2/freetype/freetype.h \
-+ minor=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
- | grep FREETYPE_MINOR \
- | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
-- patch=`grep define $includedir/freetype2/freetype/freetype.h \
-+ patch=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
- | grep FREETYPE_PATCH \
- | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
- echo $major.$minor.$patch
- fi
-
- if test "$echo_cflags" = "yes" ; then
-- cflags="-I$includedir/freetype2"
-- if test "$includedir" != "/usr/include" ; then
-- echo $cflags -I$includedir
-+ cflags="-I${SYSROOT}$includedir/freetype2"
-+ if test "${SYSROOT}$includedir" != "/usr/include" ; then
-+ echo $cflags -I${SYSROOT}$includedir
- else
- echo $cflags
- fi
-@@ -145,8 +145,8 @@ if test "$echo_libs" = "yes" ; then
- eval "rpath=\"$hardcode_libdir_flag_spec\""
- fi
- libs="-lfreetype @LIBZ@ @FT2_EXTRA_LIBS@"
-- if test "$libdir" != "/usr/lib" && test "$libdir" != "/usr/lib64"; then
-- echo -L$libdir $rpath $libs
-+ if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != "/usr/lib64"; then
-+ echo -L${SYSROOT}$libdir $libs
- else
- echo $libs
- fi
-@@ -154,7 +154,7 @@ fi
-
- if test "$echo_libtool" = "yes" ; then
- convlib="libfreetype.la"
-- echo $libdir/$convlib
-+ echo ${SYSROOT}$libdir/$convlib
- fi
-
- # EOF
diff --git a/patches/freetype-2.3.11/series b/patches/freetype-2.3.11/series
deleted file mode 100644
index 5d703e3..0000000
--- a/patches/freetype-2.3.11/series
+++ /dev/null
@@ -1 +0,0 @@
-builds_unix_freetype-config_in_sysroot.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 25/28] glademm: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (22 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 24/28] freetype: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 26/28] gpsd: " Robert Schwebel
` (2 subsequent siblings)
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
...take-out-double-qualification-of-function.patch | 26 +++
.../0002-make-pkg-config-binary-configurable.patch | 96 ++++++++++++
...-box-with-response-id-will-also-get-packe.patch | 30 ++++
patches/glademm-2.6.0/0004-fix-gladeonly.patch | 107 +++++++++++++
.../0005-fix-code-generation-for-Gtk-Table.patch | 52 ++++++
...006-fix-code-generation-for-Gtk-Alignment.patch | 37 +++++
...007-add-gettext-to-enable-gettext-support.patch | 43 +++++
.../glademm-2.6.0/0008-Add-support-for-gwt.patch | 163 ++++++++++++++++++++
...d-namespace-fixes-for-a-stricter-compiler.patch | 83 ++++++++++
.../box_pack_child_with_responseid.diff | 32 ----
patches/glademm-2.6.0/configurable_pkgconfig.diff | 95 ------------
patches/glademm-2.6.0/fix-alignment-writer.diff | 34 ----
patches/glademm-2.6.0/fix-for-new-gcc.diff | 78 ----------
patches/glademm-2.6.0/fix-glade-only.diff | 104 -------------
patches/glademm-2.6.0/fix-table-attach.diff | 49 ------
.../glademm-2.6.0/fix_double_qualification.diff | 24 ---
patches/glademm-2.6.0/gettext-param.diff | 41 -----
patches/glademm-2.6.0/gwt-support.diff | 156 -------------------
patches/glademm-2.6.0/series | 9 -
19 files changed, 637 insertions(+), 622 deletions(-)
create mode 100644 patches/glademm-2.6.0/0001-take-out-double-qualification-of-function.patch
create mode 100644 patches/glademm-2.6.0/0002-make-pkg-config-binary-configurable.patch
create mode 100644 patches/glademm-2.6.0/0003-children-of-box-with-response-id-will-also-get-packe.patch
create mode 100644 patches/glademm-2.6.0/0004-fix-gladeonly.patch
create mode 100644 patches/glademm-2.6.0/0005-fix-code-generation-for-Gtk-Table.patch
create mode 100644 patches/glademm-2.6.0/0006-fix-code-generation-for-Gtk-Alignment.patch
create mode 100644 patches/glademm-2.6.0/0007-add-gettext-to-enable-gettext-support.patch
create mode 100644 patches/glademm-2.6.0/0008-Add-support-for-gwt.patch
create mode 100644 patches/glademm-2.6.0/0009-include-and-namespace-fixes-for-a-stricter-compiler.patch
delete mode 100644 patches/glademm-2.6.0/box_pack_child_with_responseid.diff
delete mode 100644 patches/glademm-2.6.0/configurable_pkgconfig.diff
delete mode 100644 patches/glademm-2.6.0/fix-alignment-writer.diff
delete mode 100644 patches/glademm-2.6.0/fix-for-new-gcc.diff
delete mode 100644 patches/glademm-2.6.0/fix-glade-only.diff
delete mode 100644 patches/glademm-2.6.0/fix-table-attach.diff
delete mode 100644 patches/glademm-2.6.0/fix_double_qualification.diff
delete mode 100644 patches/glademm-2.6.0/gettext-param.diff
delete mode 100644 patches/glademm-2.6.0/gwt-support.diff
delete mode 100644 patches/glademm-2.6.0/series
diff --git a/patches/glademm-2.6.0/0001-take-out-double-qualification-of-function.patch b/patches/glademm-2.6.0/0001-take-out-double-qualification-of-function.patch
new file mode 100644
index 0000000..7b9cac4
--- /dev/null
+++ b/patches/glademm-2.6.0/0001-take-out-double-qualification-of-function.patch
@@ -0,0 +1,26 @@
+From 9eb4ef932422c8c80a3799f161f208dcaad9063e Mon Sep 17 00:00:00 2001
+From: unknown author <unknown.author@example.com>
+Date: Sun, 30 Oct 2011 22:29:02 +0100
+Subject: [PATCH 1/9] take out double qualification of function
+
+Signed-off-by: n.a.
+---
+ src/writers/gnome_app.hh | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/writers/gnome_app.hh b/src/writers/gnome_app.hh
+index 401e7f9..0c22210 100644
+--- a/src/writers/gnome_app.hh
++++ b/src/writers/gnome_app.hh
+@@ -28,7 +28,7 @@ class Gnome_App : public Gtk_Window
+ virtual bool NeedExplicitCtor(const Widget &w) const;
+ virtual void ConstructionArgs(const Widget &w, CxxFile &f) const;
+ virtual void Configure(const Widget &w, CxxFile &f,const std::string &instance) const;
+- virtual Subwidget Gnome_App::IsSubwidget(const Widget &w,const Widget &ch) const;
++ virtual Subwidget IsSubwidget(const Widget &w,const Widget &ch) const;
+ virtual const std::string InternalInstance(const Widget &parent,const Widget &w2) const;
+ virtual void AddChildren(const Widget &w,CxxFile &f,const std::string &instance,const WriterBase &writer_for_subw, const Widget &widget_for_subw) const;
+ };
+--
+1.7.7
+
diff --git a/patches/glademm-2.6.0/0002-make-pkg-config-binary-configurable.patch b/patches/glademm-2.6.0/0002-make-pkg-config-binary-configurable.patch
new file mode 100644
index 0000000..bb052e0
--- /dev/null
+++ b/patches/glademm-2.6.0/0002-make-pkg-config-binary-configurable.patch
@@ -0,0 +1,96 @@
+From 66799bb9700ec14c2f185015722ab14712e468da Mon Sep 17 00:00:00 2001
+From: unknown author <unknown.author@example.com>
+Date: Sun, 30 Oct 2011 22:29:02 +0100
+Subject: [PATCH 2/9] make pkg-config binary configurable
+
+Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
+---
+ src/Configuration.hh | 1 +
+ src/glade--.cc | 21 ++++++++++++++++-----
+ 2 files changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/src/Configuration.hh b/src/Configuration.hh
+index e6c3698..bd4d5dc 100644
+--- a/src/Configuration.hh
++++ b/src/Configuration.hh
+@@ -83,6 +83,7 @@ struct Configuration : public Naming
+ std::string pixmap_dir_relative_to_src;
+ std::string author_name;
+ std::string author_email;
++ std::string pkgconfig_bin;
+ bool debug:1;
+ bool sample_code:1;
+ bool bare_bones:1;
+diff --git a/src/glade--.cc b/src/glade--.cc
+index 0347d97..662df30 100644
+--- a/src/glade--.cc
++++ b/src/glade--.cc
+@@ -93,7 +93,7 @@ const static struct option options[]=
+ { "verbose", no_argument, NULL, 'v' },
+ { "show-options", no_argument, NULL, SHOW_OPTIONS },
+ { "image-provider", required_argument, NULL, IMAGE_PROVIDER },
+-
++ { "pkgconfig", required_argument, NULL, 'p' },
+ { NULL, 0, NULL, 0 }
+ };
+
+@@ -134,7 +134,15 @@ static bool CheckVersion(const std::string &cmd, Pkg_Version &v, Pkg_Version::So
+ { if (v.source==Pkg_Version::Command_Line) return true;
+ char buf[80];
+ bool result=false;
+- FILE *f=popen(cmd.c_str(),"r");
++ FILE *f;
++ int i;
++ std::string n_cmd = cmd.c_str();
++ std::string::size_type loc = n_cmd.find("pkg-config", 0);
++ if (Configuration.pkgconfig_bin != "" && loc != std::string::npos) {
++ n_cmd.replace(loc, Configuration.pkgconfig_bin.length(),
++ Configuration.pkgconfig_bin);
++ }
++ f=popen(n_cmd.c_str(),"r");
+ if (f)
+ { if (fgets(buf,sizeof(buf),f))
+ { if (!ignore_letters)
+@@ -144,11 +152,11 @@ static bool CheckVersion(const std::string &cmd, Pkg_Version &v, Pkg_Version::So
+ // not installed/found
+ if (!strncmp(buf,"Package ",8) && strstr(buf," not ")) result=false;
+ else if (parse_version(buf,v,src,ignore_letters)) result=true;
+- else std::cerr << cmd << ": strange result '" << buf << "'\n";
++ else std::cerr << n_cmd << ": strange result '" << buf << "'\n";
+ }
+ pclose(f);
+ }
+- else perror(cmd.c_str());
++ else perror(n_cmd.c_str());
+ return result;
+ }
+
+@@ -383,7 +391,7 @@ int main(int argc,char **argv)
+ { if (i) Configuration.commandline+=' ';
+ Configuration.commandline+=argv[i];
+ }
+- while ((opt=getopt_long(argc,argv,"d:m:h:c:Vgrs1AwlN",options,NULL))!=EOF)
++ while ((opt=getopt_long(argc,argv,"d:m:h:c:p:Vgrs1AwlN",options,NULL))!=EOF)
+ switch(opt)
+ { case 'd': Configuration.destination_directory=optarg;
+ break;
+@@ -393,6 +401,8 @@ int main(int argc,char **argv)
+ break;
+ case 'h': Configuration.header_suffix=optarg;
+ break;
++ case 'p': Configuration.pkgconfig_bin=optarg;
++ break;
+ case 'V': std::cout<< "glademm V"VERSION" (glade to Gtk-- converter)\n";
+ return 0;
+ break;
+@@ -487,6 +497,7 @@ int main(int argc,char **argv)
+ "\t--baseclass\tderive from base class (for class parameters)\n"
+ "\t--libglade\tgenerate code skeleton for a libglade-- application.\n"
+ "\t--libglade-option\tgenerate infrastructure for libglade without using it.\n"
++ "\t--pkgconfig\tpath to the pkg-config binary to be used\n"
+ "\t--version\tprints 'glademm V"VERSION"'\n";
+ return 1;
+ }
+--
+1.7.7
+
diff --git a/patches/glademm-2.6.0/0003-children-of-box-with-response-id-will-also-get-packe.patch b/patches/glademm-2.6.0/0003-children-of-box-with-response-id-will-also-get-packe.patch
new file mode 100644
index 0000000..1b3bb93
--- /dev/null
+++ b/patches/glademm-2.6.0/0003-children-of-box-with-response-id-will-also-get-packe.patch
@@ -0,0 +1,30 @@
+From 28490617a4df5f9f65294d0b1f745e536541aa93 Mon Sep 17 00:00:00 2001
+From: unknown author <unknown.author@example.com>
+Date: Sun, 30 Oct 2011 22:29:02 +0100
+Subject: [PATCH 3/9] children of box with response id will also get packed
+
+Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
+---
+ src/writers/box.cc | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/writers/box.cc b/src/writers/box.cc
+index e7e070a..b86629b 100644
+--- a/src/writers/box.cc
++++ b/src/writers/box.cc
+@@ -55,8 +55,10 @@ void Gtk_Box::AddChild(const Widget &w,CxxFile &f,const std::string &instance) c
+ int padding(ch.getIntProperty("padding",0));
+
+ // this is for dialog (see there)
+- if (GTKMM2 && w.hasProperty("response_id")) return;
+-
++ if (GTKMM2 && w.hasProperty("response_id")) {
++ if (w.getIntProperty("response_id")!=0)
++ return;
++ }
+ f.Statement() << instance
+ << (pack_end?"pack_end":"pack_start")
+ << '(' << Reference(w);
+--
+1.7.7
+
diff --git a/patches/glademm-2.6.0/0004-fix-gladeonly.patch b/patches/glademm-2.6.0/0004-fix-gladeonly.patch
new file mode 100644
index 0000000..2221bf1
--- /dev/null
+++ b/patches/glademm-2.6.0/0004-fix-gladeonly.patch
@@ -0,0 +1,107 @@
+From e446a027a0210b0e91cc66c252d53509c63f8b99 Mon Sep 17 00:00:00 2001
+From: "m.olbrich@pengutronix.de" <m.olbrich@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:29:02 +0100
+Subject: [PATCH 4/9] fix --gladeonly
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/Cxx_Fileset.cc | 6 ++++++
+ src/glade--.cc | 15 ++++++++++-----
+ 2 files changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/src/Cxx_Fileset.cc b/src/Cxx_Fileset.cc
+index 17d84cd..616c304 100644
+--- a/src/Cxx_Fileset.cc
++++ b/src/Cxx_Fileset.cc
+@@ -180,6 +180,8 @@ void Cxx_Fileset::WriteClasses(const Widget &w)
+ }
+
+ /******* H: class Xyz ******/
++ if (!Configuration.bare_bones)
++ {
+ if (Configuration.baseclass)
+ { bc.Definition().Class(Configuration.TypeName(w.Name())+"_base");
+ bc.StartBlock();
+@@ -210,6 +212,7 @@ void Cxx_Fileset::WriteClasses(const Widget &w)
+
+ DeclareSignalHandler(top_wr,w,w,true);
+ h.EndBlock();
++ }
+
+ /****** GC: include, definitions **************/
+
+@@ -405,6 +408,8 @@ void Cxx_Fileset::WriteClasses(const Widget &w)
+
+ /****** C: signal handler stubs *******/
+
++ if (!Configuration.bare_bones)
++ {
+ if (Configuration.debug)
+ std::cout << "======== C signal stubs ============\n";
+ for (Widget::const_contained_iterator i=w.begin_contained(Internal_Both);
+@@ -416,6 +421,7 @@ void Cxx_Fileset::WriteClasses(const Widget &w)
+ }
+
+ DefineSignalHandler(top_wr,w,w);
++ }
+
+ /****** other classes/files ********/
+ // recurse
+diff --git a/src/glade--.cc b/src/glade--.cc
+index 662df30..d13238e 100644
+--- a/src/glade--.cc
++++ b/src/glade--.cc
+@@ -160,10 +160,8 @@ static bool CheckVersion(const std::string &cmd, Pkg_Version &v, Pkg_Version::So
+ return result;
+ }
+
+-static void call_gtkmm_config()
+-{ CheckVersion("pkg-config --version",Configuration.pc_version,Pkg_Version::Pkg_Config);
+-
+- if (CheckVersion("automake-1.9 --version",Configuration.automake_version,Pkg_Version::MMVersion,true))
++static void call_autotool_config()
++{ if (CheckVersion("automake-1.9 --version",Configuration.automake_version,Pkg_Version::MMVersion,true))
+ Configuration.automake_name="automake-1.9";
+ else if (CheckVersion("automake-1.8 --version",Configuration.automake_version,Pkg_Version::MMVersion,true))
+ Configuration.automake_name="automake-1.8";
+@@ -189,7 +187,10 @@ static void call_gtkmm_config()
+ // Configuration.use_autoreconf=true;
+
+ CheckVersion("gettext --version",Configuration.gettext_version,Pkg_Version::MMVersion,true);
++}
+
++static void call_gtkmm_config()
++{ CheckVersion("pkg-config --version",Configuration.pc_version,Pkg_Version::Pkg_Config);
+ // Pkgconfig checks (Gnome 2)
+ if (Configuration.gnome2) {
+ if (!!Configuration.pc_version) {
+@@ -412,6 +413,7 @@ int main(int argc,char **argv)
+ case 's': Configuration.sample_code=true;
+ break;
+ case 'r': Configuration.bare_bones=true;
++ Configuration.no_autoconf=true;
+ break;
+ case 'A': Configuration.no_autoconf=true;
+ break;
+@@ -535,7 +537,8 @@ reopen:
+ else std::cerr << "Warning: strange project tag '" << t.Type() << "'\n";
+ }
+ catch (...)
+- { std::cerr << "Warning: no or illegal project file.\n";
++ { if (!Configuration.bare_bones)
++ std::cerr << "Warning: no or illegal project file.\n";
+ Tag t("glade-project","");
+ // Configuration.in_filename without path and .glade
+ std::string name=Configuration.in_filename;
+@@ -572,6 +575,8 @@ reopen:
+
+ if (Configuration.debug) top.debug(depth);
+ call_gtkmm_config();
++ if (!Configuration.no_autoconf)
++ call_autotool_config();
+
+ // Apply dependant preferences
+ if (Configuration.gettext_support)
+--
+1.7.7
+
diff --git a/patches/glademm-2.6.0/0005-fix-code-generation-for-Gtk-Table.patch b/patches/glademm-2.6.0/0005-fix-code-generation-for-Gtk-Table.patch
new file mode 100644
index 0000000..7731c2b
--- /dev/null
+++ b/patches/glademm-2.6.0/0005-fix-code-generation-for-Gtk-Table.patch
@@ -0,0 +1,52 @@
+From 96cc93ef8378d21bc94c9bac37646d0b22b4c454 Mon Sep 17 00:00:00 2001
+From: "m.olbrich@pengutronix.de" <m.olbrich@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:29:02 +0100
+Subject: [PATCH 5/9] fix code generation for Gtk::Table
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/writers/table.cc | 14 +++++++++-----
+ 1 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/src/writers/table.cc b/src/writers/table.cc
+index 69b530a..5092fc7 100644
+--- a/src/writers/table.cc
++++ b/src/writers/table.cc
+@@ -51,7 +51,7 @@ Gtk_Table::Gtk_Table()
+ void Gtk_Table::ConstructionArgs(const Widget &w, CxxFile &f) const
+ { f.FunctionArg() << w.getIntProperty("rows",2);
+ f.FunctionArg() << w.getIntProperty("columns",2);
+- f.FunctionArg() << PRINT_BOOL(w.getBoolProperty("homogeneous",true));
++ f.FunctionArg() << PRINT_BOOL(w.getBoolProperty("homogeneous",false));
+ }
+
+ std::string getAttachOptions(const ChildParamList& ch, const std::string which)
+@@ -68,6 +68,10 @@ std::string getAttachOptions(const ChildParamList& ch, const std::string which)
+ if (*i == "fill") options += "|GTK_FILL";
+ else if (*i == "expand") options += "|GTK_EXPAND";
+ else if (*i == "shrink") options += "|GTK_SHRINK";
++ else
++ { options += "|" + ch.getProperty(which+"_options");
++ break;
++ }
+ }
+ else // glade1 style
+ { if (ch.getBoolProperty(which+"expand",true)) options+="|GTK_EXPAND";
+@@ -86,10 +90,10 @@ std::string getAttachOptions(const ChildParamList& ch, const std::string which)
+
+ void Gtk_Table::AddChild(const Widget &w,CxxFile &f,const std::string &instance) const
+ { const ChildParamList ch=w.get_Child_params();
+- int left_attach=ch.getIntProperty("left_attach",-1);
+- int right_attach=ch.getIntProperty("right_attach",-1);
+- int top_attach=ch.getIntProperty("top_attach",-1);
+- int bottom_attach=ch.getIntProperty("bottom_attach",-1);
++ int left_attach=ch.getIntProperty("left_attach",0);
++ int right_attach=ch.getIntProperty("right_attach",1);
++ int top_attach=ch.getIntProperty("top_attach",0);
++ int bottom_attach=ch.getIntProperty("bottom_attach",1);
+
+ std::string xoptions = getAttachOptions(ch, "x");
+ std::string yoptions = getAttachOptions(ch, "y");
+--
+1.7.7
+
diff --git a/patches/glademm-2.6.0/0006-fix-code-generation-for-Gtk-Alignment.patch b/patches/glademm-2.6.0/0006-fix-code-generation-for-Gtk-Alignment.patch
new file mode 100644
index 0000000..cf793d0
--- /dev/null
+++ b/patches/glademm-2.6.0/0006-fix-code-generation-for-Gtk-Alignment.patch
@@ -0,0 +1,37 @@
+From 7a5fcdf407570dadaf00f6fed1426d444a60056f Mon Sep 17 00:00:00 2001
+From: "m.olbrich@pengutronix.de" <m.olbrich@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:29:02 +0100
+Subject: [PATCH 6/9] fix code generation for Gtk::Alignment
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/writers/alignment.cc | 13 ++++---------
+ 1 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/src/writers/alignment.cc b/src/writers/alignment.cc
+index 23e68b4..7187767 100644
+--- a/src/writers/alignment.cc
++++ b/src/writers/alignment.cc
+@@ -43,15 +43,10 @@ const std::string Gtk_Alignment::IncludeName(const Widget &w) const
+
+ void Gtk_Alignment::ConstructionArgs(const Widget &w, CxxFile &f) const
+ {
+- if( w.hasProperty("xalign") && w.hasProperty("yalign") &&
+- w.hasProperty("xscale") && w.hasProperty("yscale") )
+- {
+- f.FunctionArg() << w.getFloatProperty("xalign");
+- f.FunctionArg() << w.getFloatProperty("yalign");
+- f.FunctionArg() << w.getFloatProperty("xscale");
+- f.FunctionArg() << w.getFloatProperty("yscale");
+- }
+- else f.FunctionArg();
++ f.FunctionArg() << (w.hasProperty("xalign") ? w.getFloatProperty("xalign") : 0.5);
++ f.FunctionArg() << (w.hasProperty("yalign") ? w.getFloatProperty("yalign") : 0.5);
++ f.FunctionArg() << (w.hasProperty("xscale") ? w.getFloatProperty("xscale") : 1.0);
++ f.FunctionArg() << (w.hasProperty("yscale") ? w.getFloatProperty("yscale") : 1.0);
+ }
+
+ Gtk_Alignment::Gtk_Alignment()
+--
+1.7.7
+
diff --git a/patches/glademm-2.6.0/0007-add-gettext-to-enable-gettext-support.patch b/patches/glademm-2.6.0/0007-add-gettext-to-enable-gettext-support.patch
new file mode 100644
index 0000000..61f1a5c
--- /dev/null
+++ b/patches/glademm-2.6.0/0007-add-gettext-to-enable-gettext-support.patch
@@ -0,0 +1,43 @@
+From b8bebe8e2ff2e17ef44bf3aee4aa42a7ff055370 Mon Sep 17 00:00:00 2001
+From: "m.olbrich@pengutronix.de" <m.olbrich@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:29:02 +0100
+Subject: [PATCH 7/9] add --gettext to enable gettext support
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/glade--.cc | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/src/glade--.cc b/src/glade--.cc
+index d13238e..70c6608 100644
+--- a/src/glade--.cc
++++ b/src/glade--.cc
+@@ -94,6 +94,7 @@ const static struct option options[]=
+ { "show-options", no_argument, NULL, SHOW_OPTIONS },
+ { "image-provider", required_argument, NULL, IMAGE_PROVIDER },
+ { "pkgconfig", required_argument, NULL, 'p' },
++ { "gettext", no_argument, NULL, 't' },
+ { NULL, 0, NULL, 0 }
+ };
+
+@@ -404,6 +405,8 @@ int main(int argc,char **argv)
+ break;
+ case 'p': Configuration.pkgconfig_bin=optarg;
+ break;
++ case 't': Configuration.gettext_support=true;
++ break;
+ case 'V': std::cout<< "glademm V"VERSION" (glade to Gtk-- converter)\n";
+ return 0;
+ break;
+@@ -547,7 +550,7 @@ reopen:
+ if (name.substr(name.size()-6,6)==".glade") name=name.substr(0,name.size()-6);
+ t.push_back(Tag("program_name",name));
+ t.push_back(Tag("gnome_support","false"));
+- t.push_back(Tag("gettext_support","false"));
++ t.push_back(Tag("gettext_support",Configuration.gettext_support ? "true" : "false"));
+ ApplyProject(t);
+ }
+ }
+--
+1.7.7
+
diff --git a/patches/glademm-2.6.0/0008-Add-support-for-gwt.patch b/patches/glademm-2.6.0/0008-Add-support-for-gwt.patch
new file mode 100644
index 0000000..fa8feb2
--- /dev/null
+++ b/patches/glademm-2.6.0/0008-Add-support-for-gwt.patch
@@ -0,0 +1,163 @@
+From 8e437a16d254386ec29cc2e73800f9c0ad008721 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich Produce code for all gwt widgets
+ <m.olbrich@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:29:02 +0100
+Subject: [PATCH 8/9] Add support for gwt
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/writers/Makefile.am | 1 +
+ src/writers/WriterBase.cc | 9 +++--
+ src/writers/WriterBase.hh | 3 +-
+ src/writers/gwt.cc | 80 +++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 89 insertions(+), 4 deletions(-)
+ create mode 100644 src/writers/gwt.cc
+
+diff --git a/src/writers/Makefile.am b/src/writers/Makefile.am
+index 94a1b23..9a0bace 100644
+--- a/src/writers/Makefile.am
++++ b/src/writers/Makefile.am
+@@ -25,6 +25,7 @@ noinst_HEADERS = WriterBase.hh adjustment.hh bin.hh box.hh button.hh \
+ togglebutton.hh toolitem.hh widget.hh window.hh safemap.hh
+
+ libwriters_a_SOURCES = WriterBase.cc WriterBase_matches.cc Class.cc \
++ gwt.cc \
+ accellabel.cc \
+ accelgroup.cc adjustment.cc alignment.cc arrow.cc \
+ aspectframe.cc bbox.cc bonobo_dock.cc bonobo_dockitem.cc \
+diff --git a/src/writers/WriterBase.cc b/src/writers/WriterBase.cc
+index f893d32..a91d4b4 100644
+--- a/src/writers/WriterBase.cc
++++ b/src/writers/WriterBase.cc
+@@ -322,15 +322,17 @@ void WriterBase::WriteTranslatableProperty(const Widget &w, CxxFile &f, const st
+ }
+ }
+
+-void WriterBase::WriteEnumPropertyNS(const Widget &w, CxxFile &f, const std::string &instance, const std::string &property, bool only_new)
+-{ if (w.hasProperty(property))
++void WriterBase::WriteEnumPropertyNS(const Widget &w, CxxFile &f, const std::string &instance, const std::string &property,
++ bool only_new, std::string functname)
++{ if (functname.empty()) functname=property;
++ if (w.hasProperty(property))
+ { f.Statement() << instance;
+ std::string val=Gtkmm2Namespace(w.getProperty(property));
+ if (only_new && GTKMM2)
+ f << "property_" << property << "().set_value("
+ << val << ')';
+ else
+- f << "set_" << property << '('
++ f << "set_" << functname << '('
+ << val << ')';
+ }
+ }
+@@ -436,6 +438,7 @@ std::string WriterBase::Gtkmm2Namespace(const std::string &s)
+ std::string res=s;
+ replace_all(res,"GTK_","Gtk::");
+ replace_all(res,"GDK_","Gdk::");
++ replace_all(res,"GWT_","Gwt::");
+ return res;
+ }
+
+diff --git a/src/writers/WriterBase.hh b/src/writers/WriterBase.hh
+index 8a8c972..5c6f97d 100644
+--- a/src/writers/WriterBase.hh
++++ b/src/writers/WriterBase.hh
+@@ -186,7 +186,8 @@ public: // for new property based code
+ static void WriteTranslatableProperty(const Widget &w, CxxFile &f, const std::string &instance, const std::string &property, bool only_new=false);
+ static void WriteBoolProperty(const Widget &w, CxxFile &f, const std::string &instance, const std::string &property,
+ bool only_new=false, std::string functname="");
+- static void WriteEnumPropertyNS(const Widget &w, CxxFile &f, const std::string &instance, const std::string &property, bool only_new=false);
++ static void WriteEnumPropertyNS(const Widget &w, CxxFile &f, const std::string &instance, const std::string &property,
++ bool only_new=false, std::string functname="");
+ static void WriteIntProperty(const Widget &w, CxxFile &f, const std::string &instance, const std::string &property,
+ bool only_new=false, std::string functname="");
+ static void WriteIntIntProperty(const Widget &w, CxxFile &f, const std::string &instance,
+diff --git a/src/writers/gwt.cc b/src/writers/gwt.cc
+new file mode 100644
+index 0000000..b622c0c
+--- /dev/null
++++ b/src/writers/gwt.cc
+@@ -0,0 +1,80 @@
++// $Id: gwt.cc,v 1.14 2002/05/14 08:25:44 christof Exp $
++/* glade--: C++ frontend for glade (Gtk+ User Interface Builder)
++ * Copyright (C) 1998 Christof Petig
++ * Copyright (C) 1999-2000 Adolf Petig GmbH & Co. KG, written by Christof Petig
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ */
++
++#include "drawingarea.hh"
++
++class Gwt_PlotCanvas : public Gtk_DrawingArea
++{public:
++ typedef Gtk_DrawingArea Parent;
++ virtual const std::string TypeName(const Widget &w) const;
++ virtual const std::string IncludeName(const Widget &w) const;
++ Gwt_PlotCanvas();
++ virtual bool NeedExplicitCtor(const Widget &w) const
++ { return false; }
++ virtual void ConstructionArgs(Widget const &w, CxxFile &f) const
++ { f.FunctionArg(); }
++};
++
++static Gwt_PlotCanvas Gwt_PlotCanvas;
++
++const std::string Gwt_PlotCanvas::TypeName(const Widget &w) const
++{ return "Gwt::PlotCanvas";
++}
++
++const std::string Gwt_PlotCanvas::IncludeName(const Widget &w) const
++{ return "gwtmm/gwtmm.h";
++}
++
++Gwt_PlotCanvas::Gwt_PlotCanvas()
++{ Writer["GwtPlotCanvas"]=this;
++}
++
++class Gwt_PlotScale : public Gtk_DrawingArea
++{public:
++ typedef Gtk_DrawingArea Parent;
++ virtual const std::string TypeName(const Widget &w) const;
++ virtual const std::string IncludeName(const Widget &w) const;
++ Gwt_PlotScale();
++ virtual void Configure(const Widget &w, CxxFile &f,const std::string &instance) const;
++ virtual bool NeedExplicitCtor(const Widget &w) const
++ { return false; }
++ virtual void ConstructionArgs(Widget const &w, CxxFile &f) const
++ { f.FunctionArg(); }
++};
++
++static Gwt_PlotScale Gwt_PlotScale;
++
++const std::string Gwt_PlotScale::TypeName(const Widget &w) const
++{ return "Gwt::PlotScale";
++}
++
++const std::string Gwt_PlotScale::IncludeName(const Widget &w) const
++{ return "gwtmm/gwtmm.h";
++}
++
++Gwt_PlotScale::Gwt_PlotScale()
++{ Writer["GwtPlotScale"]=this;
++}
++
++void Gwt_PlotScale::Configure(const Widget &w, CxxFile &f,const std::string &instance) const
++{ Parent::Configure(w,f,instance);
++ WriteEnumPropertyNS(w,f,instance, "scale_type", false, "type");
++}
++
+--
+1.7.7
+
diff --git a/patches/glademm-2.6.0/0009-include-and-namespace-fixes-for-a-stricter-compiler.patch b/patches/glademm-2.6.0/0009-include-and-namespace-fixes-for-a-stricter-compiler.patch
new file mode 100644
index 0000000..359f4eb
--- /dev/null
+++ b/patches/glademm-2.6.0/0009-include-and-namespace-fixes-for-a-stricter-compiler.patch
@@ -0,0 +1,83 @@
+From cc0d0fc7de8e70e48709bc08168e28c94fc42bce Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:29:02 +0100
+Subject: [PATCH 9/9] include and namespace fixes for a stricter compiler
+
+g++-4.3 is a lot stricter with respect to the C++ standard.
+This patch adds various includes that used to be implicit.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/Tag.hh | 1 +
+ src/TagStream.cc | 7 ++++---
+ src/writers/WriterBase.hh | 1 +
+ src/writers/xpmname.cc | 1 +
+ 4 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/Tag.hh b/src/Tag.hh
+index 2732a3a..d6fe055 100644
+--- a/src/Tag.hh
++++ b/src/Tag.hh
+@@ -23,6 +23,7 @@
+ #include <config.h>
+ #endif
+ #include <string>
++#include <string.h>
+ #include <vector>
+ #include <algorithm> // for find
+ #include <stdexcept>
+diff --git a/src/TagStream.cc b/src/TagStream.cc
+index 213ba2d..d220562 100644
+--- a/src/TagStream.cc
++++ b/src/TagStream.cc
+@@ -18,9 +18,10 @@
+ */
+
+ #include "TagStream.hh"
++#include <iostream>
+ #include <cstring>
++#include <algorithm>
+ #include <unistd.h>
+-#include <algo.h>
+
+ //#define REMEMBER_EMPTY_SPACE
+
+@@ -73,10 +74,10 @@ std::string TagStream::de_xml(const std::string &cont)
+ { std::string ret;
+ std::string::const_iterator i(cont.begin());
+ while (i!=cont.end())
+- { std::string::const_iterator verbatim(::find(i,cont.end(),'&'));
++ { std::string::const_iterator verbatim(std::find(i,cont.end(),'&'));
+ ret+=std::string(i,verbatim);
+ if (verbatim!=cont.end())
+- { std::string::const_iterator endtag(::find(verbatim,cont.end(),';'));
++ { std::string::const_iterator endtag(std::find(verbatim,cont.end(),';'));
+ if (endtag!=cont.end()) ++endtag;
+ std::string tag(verbatim,endtag);
+ if (tag[1]=='#' && tag[2]=='x')
+diff --git a/src/writers/WriterBase.hh b/src/writers/WriterBase.hh
+index 5c6f97d..f1d6e7c 100644
+--- a/src/writers/WriterBase.hh
++++ b/src/writers/WriterBase.hh
+@@ -22,6 +22,7 @@
+ #define WRITER_BASE_HH
+ #include <safemap.hh>
+ #include <string>
++#include <string.h>
+ #include "../Enums.hh"
+ // these are not necessary for all widgets,
+ // but it's convenient to have them defined
+diff --git a/src/writers/xpmname.cc b/src/writers/xpmname.cc
+index 626b98e..5c336c2 100644
+--- a/src/writers/xpmname.cc
++++ b/src/writers/xpmname.cc
+@@ -1,5 +1,6 @@
+ #include <cstdio>
+ #include <string>
++#include <string.h>
+ #include <Configuration.hh>
+
+ // parts taken from
+--
+1.7.7
+
diff --git a/patches/glademm-2.6.0/box_pack_child_with_responseid.diff b/patches/glademm-2.6.0/box_pack_child_with_responseid.diff
deleted file mode 100644
index e937454..0000000
--- a/patches/glademm-2.6.0/box_pack_child_with_responseid.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-Subject: children of box with response id will also get packed
-By: Luotao Fu <l.fu@pengutronix.de>
- Box addchild function returns before adding pack...() call if "response_id"
- is set in property. This is bad because the most objects have a response_id,
- though marked to 0. Without this patch we will only be able to see few
- objects like radiobuttons in a box, most objects don't appear at all. To
- solve this problem we acquire the property value now and only return if it's
- not 0. (I'm not quite sure what this response_id is actually for, question to
- developer is pending)
-
-Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
----
- src/writers/box.cc | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-Index: b/src/writers/box.cc
-===================================================================
---- a/src/writers/box.cc
-+++ b/src/writers/box.cc
-@@ -55,8 +55,10 @@ void Gtk_Box::AddChild(const Widget &w,C
- int padding(ch.getIntProperty("padding",0));
-
- // this is for dialog (see there)
-- if (GTKMM2 && w.hasProperty("response_id")) return;
--
-+ if (GTKMM2 && w.hasProperty("response_id")) {
-+ if (w.getIntProperty("response_id")!=0)
-+ return;
-+ }
- f.Statement() << instance
- << (pack_end?"pack_end":"pack_start")
- << '(' << Reference(w);
diff --git a/patches/glademm-2.6.0/configurable_pkgconfig.diff b/patches/glademm-2.6.0/configurable_pkgconfig.diff
deleted file mode 100644
index eeb2d2b..0000000
--- a/patches/glademm-2.6.0/configurable_pkgconfig.diff
+++ /dev/null
@@ -1,95 +0,0 @@
-Subject: make pkg-config binary configurable
-By: Luotao Fu <l.fu@pengutronix.de>
- glademm calls directly pkg-config in $PATH. We however need that customizable
- pkg-config to be called, i.E. our host built pkg-config in BSP. Hence we make
- the path to the pkg-config we want to call configurable via parameter.
- not determined for upstream
-
-Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
----
- src/Configuration.hh | 1 +
- src/glade--.cc | 21 ++++++++++++++++-----
- 2 files changed, 17 insertions(+), 5 deletions(-)
-
-Index: b/src/glade--.cc
-===================================================================
---- a/src/glade--.cc
-+++ b/src/glade--.cc
-@@ -93,7 +93,7 @@ const static struct option options[]=
- { "verbose", no_argument, NULL, 'v' },
- { "show-options", no_argument, NULL, SHOW_OPTIONS },
- { "image-provider", required_argument, NULL, IMAGE_PROVIDER },
--
-+ { "pkgconfig", required_argument, NULL, 'p' },
- { NULL, 0, NULL, 0 }
- };
-
-@@ -134,7 +134,15 @@ static bool CheckVersion(const std::stri
- { if (v.source==Pkg_Version::Command_Line) return true;
- char buf[80];
- bool result=false;
-- FILE *f=popen(cmd.c_str(),"r");
-+ FILE *f;
-+ int i;
-+ std::string n_cmd = cmd.c_str();
-+ std::string::size_type loc = n_cmd.find("pkg-config", 0);
-+ if (Configuration.pkgconfig_bin != "" && loc != std::string::npos) {
-+ n_cmd.replace(loc, Configuration.pkgconfig_bin.length(),
-+ Configuration.pkgconfig_bin);
-+ }
-+ f=popen(n_cmd.c_str(),"r");
- if (f)
- { if (fgets(buf,sizeof(buf),f))
- { if (!ignore_letters)
-@@ -144,11 +152,11 @@ static bool CheckVersion(const std::stri
- // not installed/found
- if (!strncmp(buf,"Package ",8) && strstr(buf," not ")) result=false;
- else if (parse_version(buf,v,src,ignore_letters)) result=true;
-- else std::cerr << cmd << ": strange result '" << buf << "'\n";
-+ else std::cerr << n_cmd << ": strange result '" << buf << "'\n";
- }
- pclose(f);
- }
-- else perror(cmd.c_str());
-+ else perror(n_cmd.c_str());
- return result;
- }
-
-@@ -383,7 +391,7 @@ int main(int argc,char **argv)
- { if (i) Configuration.commandline+=' ';
- Configuration.commandline+=argv[i];
- }
-- while ((opt=getopt_long(argc,argv,"d:m:h:c:Vgrs1AwlN",options,NULL))!=EOF)
-+ while ((opt=getopt_long(argc,argv,"d:m:h:c:p:Vgrs1AwlN",options,NULL))!=EOF)
- switch(opt)
- { case 'd': Configuration.destination_directory=optarg;
- break;
-@@ -393,6 +401,8 @@ int main(int argc,char **argv)
- break;
- case 'h': Configuration.header_suffix=optarg;
- break;
-+ case 'p': Configuration.pkgconfig_bin=optarg;
-+ break;
- case 'V': std::cout<< "glademm V"VERSION" (glade to Gtk-- converter)\n";
- return 0;
- break;
-@@ -487,6 +497,7 @@ int main(int argc,char **argv)
- "\t--baseclass\tderive from base class (for class parameters)\n"
- "\t--libglade\tgenerate code skeleton for a libglade-- application.\n"
- "\t--libglade-option\tgenerate infrastructure for libglade without using it.\n"
-+ "\t--pkgconfig\tpath to the pkg-config binary to be used\n"
- "\t--version\tprints 'glademm V"VERSION"'\n";
- return 1;
- }
-Index: b/src/Configuration.hh
-===================================================================
---- a/src/Configuration.hh
-+++ b/src/Configuration.hh
-@@ -83,6 +83,7 @@ struct Configuration : public Naming
- std::string pixmap_dir_relative_to_src;
- std::string author_name;
- std::string author_email;
-+ std::string pkgconfig_bin;
- bool debug:1;
- bool sample_code:1;
- bool bare_bones:1;
diff --git a/patches/glademm-2.6.0/fix-alignment-writer.diff b/patches/glademm-2.6.0/fix-alignment-writer.diff
deleted file mode 100644
index 0956302..0000000
--- a/patches/glademm-2.6.0/fix-alignment-writer.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Subject: fix code generation for Gtk::Alignment
-From: Michael Olbrich <m.olbrich@pengutronix.de>
- Produce correct code even if some properties have the default values and
- are not specified in the glade file.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/writers/alignment.cc | 13 ++++---------
- 1 file changed, 4 insertions(+), 9 deletions(-)
-
-Index: b/src/writers/alignment.cc
-===================================================================
---- a/src/writers/alignment.cc
-+++ b/src/writers/alignment.cc
-@@ -43,15 +43,10 @@ const std::string Gtk_Alignment::Include
-
- void Gtk_Alignment::ConstructionArgs(const Widget &w, CxxFile &f) const
- {
-- if( w.hasProperty("xalign") && w.hasProperty("yalign") &&
-- w.hasProperty("xscale") && w.hasProperty("yscale") )
-- {
-- f.FunctionArg() << w.getFloatProperty("xalign");
-- f.FunctionArg() << w.getFloatProperty("yalign");
-- f.FunctionArg() << w.getFloatProperty("xscale");
-- f.FunctionArg() << w.getFloatProperty("yscale");
-- }
-- else f.FunctionArg();
-+ f.FunctionArg() << (w.hasProperty("xalign") ? w.getFloatProperty("xalign") : 0.5);
-+ f.FunctionArg() << (w.hasProperty("yalign") ? w.getFloatProperty("yalign") : 0.5);
-+ f.FunctionArg() << (w.hasProperty("xscale") ? w.getFloatProperty("xscale") : 1.0);
-+ f.FunctionArg() << (w.hasProperty("yscale") ? w.getFloatProperty("yscale") : 1.0);
- }
-
- Gtk_Alignment::Gtk_Alignment()
diff --git a/patches/glademm-2.6.0/fix-for-new-gcc.diff b/patches/glademm-2.6.0/fix-for-new-gcc.diff
deleted file mode 100644
index eca5a37..0000000
--- a/patches/glademm-2.6.0/fix-for-new-gcc.diff
+++ /dev/null
@@ -1,78 +0,0 @@
-Subject: include and namespace fixes for a stricter compiler
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-
-g++-4.3 is a lot stricter with respect to the C++ standard.
-This patch adds various includes that used to be implicit.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/Tag.hh | 1 +
- src/TagStream.cc | 7 ++++---
- src/writers/WriterBase.hh | 1 +
- src/writers/xpmname.cc | 1 +
- 4 files changed, 7 insertions(+), 3 deletions(-)
-
-Index: b/src/writers/WriterBase.hh
-===================================================================
---- a/src/writers/WriterBase.hh
-+++ b/src/writers/WriterBase.hh
-@@ -22,6 +22,7 @@
- #define WRITER_BASE_HH
- #include <safemap.hh>
- #include <string>
-+#include <string.h>
- #include "../Enums.hh"
- // these are not necessary for all widgets,
- // but it's convenient to have them defined
-Index: b/src/Tag.hh
-===================================================================
---- a/src/Tag.hh
-+++ b/src/Tag.hh
-@@ -23,6 +23,7 @@
- #include <config.h>
- #endif
- #include <string>
-+#include <string.h>
- #include <vector>
- #include <algorithm> // for find
- #include <stdexcept>
-Index: b/src/writers/xpmname.cc
-===================================================================
---- a/src/writers/xpmname.cc
-+++ b/src/writers/xpmname.cc
-@@ -1,5 +1,6 @@
- #include <cstdio>
- #include <string>
-+#include <string.h>
- #include <Configuration.hh>
-
- // parts taken from
-Index: b/src/TagStream.cc
-===================================================================
---- a/src/TagStream.cc
-+++ b/src/TagStream.cc
-@@ -18,9 +18,10 @@
- */
-
- #include "TagStream.hh"
-+#include <iostream>
- #include <cstring>
-+#include <algorithm>
- #include <unistd.h>
--#include <algo.h>
-
- //#define REMEMBER_EMPTY_SPACE
-
-@@ -73,10 +74,10 @@ std::string TagStream::de_xml(const std:
- { std::string ret;
- std::string::const_iterator i(cont.begin());
- while (i!=cont.end())
-- { std::string::const_iterator verbatim(::find(i,cont.end(),'&'));
-+ { std::string::const_iterator verbatim(std::find(i,cont.end(),'&'));
- ret+=std::string(i,verbatim);
- if (verbatim!=cont.end())
-- { std::string::const_iterator endtag(::find(verbatim,cont.end(),';'));
-+ { std::string::const_iterator endtag(std::find(verbatim,cont.end(),';'));
- if (endtag!=cont.end()) ++endtag;
- std::string tag(verbatim,endtag);
- if (tag[1]=='#' && tag[2]=='x')
diff --git a/patches/glademm-2.6.0/fix-glade-only.diff b/patches/glademm-2.6.0/fix-glade-only.diff
deleted file mode 100644
index 6d63a33..0000000
--- a/patches/glademm-2.6.0/fix-glade-only.diff
+++ /dev/null
@@ -1,104 +0,0 @@
-Subject: fix --gladeonly
-From: Michael Olbrich <m.olbrich@pengutronix.de>
- Don't do things that are not needed to create *_glade.* files.
- This fixes a crash and various bogus output.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/Cxx_Fileset.cc | 6 ++++++
- src/glade--.cc | 15 ++++++++++-----
- 2 files changed, 16 insertions(+), 5 deletions(-)
-
-Index: b/src/Cxx_Fileset.cc
-===================================================================
---- a/src/Cxx_Fileset.cc
-+++ b/src/Cxx_Fileset.cc
-@@ -180,6 +180,8 @@ void Cxx_Fileset::WriteClasses(const Wid
- }
-
- /******* H: class Xyz ******/
-+ if (!Configuration.bare_bones)
-+ {
- if (Configuration.baseclass)
- { bc.Definition().Class(Configuration.TypeName(w.Name())+"_base");
- bc.StartBlock();
-@@ -210,6 +212,7 @@ void Cxx_Fileset::WriteClasses(const Wid
-
- DeclareSignalHandler(top_wr,w,w,true);
- h.EndBlock();
-+ }
-
- /****** GC: include, definitions **************/
-
-@@ -405,6 +408,8 @@ void Cxx_Fileset::WriteClasses(const Wid
-
- /****** C: signal handler stubs *******/
-
-+ if (!Configuration.bare_bones)
-+ {
- if (Configuration.debug)
- std::cout << "======== C signal stubs ============\n";
- for (Widget::const_contained_iterator i=w.begin_contained(Internal_Both);
-@@ -416,6 +421,7 @@ void Cxx_Fileset::WriteClasses(const Wid
- }
-
- DefineSignalHandler(top_wr,w,w);
-+ }
-
- /****** other classes/files ********/
- // recurse
-Index: b/src/glade--.cc
-===================================================================
---- a/src/glade--.cc
-+++ b/src/glade--.cc
-@@ -160,10 +160,8 @@ static bool CheckVersion(const std::stri
- return result;
- }
-
--static void call_gtkmm_config()
--{ CheckVersion("pkg-config --version",Configuration.pc_version,Pkg_Version::Pkg_Config);
--
-- if (CheckVersion("automake-1.9 --version",Configuration.automake_version,Pkg_Version::MMVersion,true))
-+static void call_autotool_config()
-+{ if (CheckVersion("automake-1.9 --version",Configuration.automake_version,Pkg_Version::MMVersion,true))
- Configuration.automake_name="automake-1.9";
- else if (CheckVersion("automake-1.8 --version",Configuration.automake_version,Pkg_Version::MMVersion,true))
- Configuration.automake_name="automake-1.8";
-@@ -189,7 +187,10 @@ static void call_gtkmm_config()
- // Configuration.use_autoreconf=true;
-
- CheckVersion("gettext --version",Configuration.gettext_version,Pkg_Version::MMVersion,true);
-+}
-
-+static void call_gtkmm_config()
-+{ CheckVersion("pkg-config --version",Configuration.pc_version,Pkg_Version::Pkg_Config);
- // Pkgconfig checks (Gnome 2)
- if (Configuration.gnome2) {
- if (!!Configuration.pc_version) {
-@@ -412,6 +413,7 @@ int main(int argc,char **argv)
- case 's': Configuration.sample_code=true;
- break;
- case 'r': Configuration.bare_bones=true;
-+ Configuration.no_autoconf=true;
- break;
- case 'A': Configuration.no_autoconf=true;
- break;
-@@ -535,7 +537,8 @@ reopen:
- else std::cerr << "Warning: strange project tag '" << t.Type() << "'\n";
- }
- catch (...)
-- { std::cerr << "Warning: no or illegal project file.\n";
-+ { if (!Configuration.bare_bones)
-+ std::cerr << "Warning: no or illegal project file.\n";
- Tag t("glade-project","");
- // Configuration.in_filename without path and .glade
- std::string name=Configuration.in_filename;
-@@ -572,6 +575,8 @@ reopen:
-
- if (Configuration.debug) top.debug(depth);
- call_gtkmm_config();
-+ if (!Configuration.no_autoconf)
-+ call_autotool_config();
-
- // Apply dependant preferences
- if (Configuration.gettext_support)
diff --git a/patches/glademm-2.6.0/fix-table-attach.diff b/patches/glademm-2.6.0/fix-table-attach.diff
deleted file mode 100644
index 7564bb3..0000000
--- a/patches/glademm-2.6.0/fix-table-attach.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-Subject: fix code generation for Gtk::Table
-From: Michael Olbrich <m.olbrich@pengutronix.de>
- Use the correct default values.
- Note: this may break old glade files (glade-2 and older).
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/writers/table.cc | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-Index: b/src/writers/table.cc
-===================================================================
---- a/src/writers/table.cc
-+++ b/src/writers/table.cc
-@@ -51,7 +51,7 @@ Gtk_Table::Gtk_Table()
- void Gtk_Table::ConstructionArgs(const Widget &w, CxxFile &f) const
- { f.FunctionArg() << w.getIntProperty("rows",2);
- f.FunctionArg() << w.getIntProperty("columns",2);
-- f.FunctionArg() << PRINT_BOOL(w.getBoolProperty("homogeneous",true));
-+ f.FunctionArg() << PRINT_BOOL(w.getBoolProperty("homogeneous",false));
- }
-
- std::string getAttachOptions(const ChildParamList& ch, const std::string which)
-@@ -68,6 +68,10 @@ std::string getAttachOptions(const Child
- if (*i == "fill") options += "|GTK_FILL";
- else if (*i == "expand") options += "|GTK_EXPAND";
- else if (*i == "shrink") options += "|GTK_SHRINK";
-+ else
-+ { options += "|" + ch.getProperty(which+"_options");
-+ break;
-+ }
- }
- else // glade1 style
- { if (ch.getBoolProperty(which+"expand",true)) options+="|GTK_EXPAND";
-@@ -86,10 +90,10 @@ std::string getAttachOptions(const Child
-
- void Gtk_Table::AddChild(const Widget &w,CxxFile &f,const std::string &instance) const
- { const ChildParamList ch=w.get_Child_params();
-- int left_attach=ch.getIntProperty("left_attach",-1);
-- int right_attach=ch.getIntProperty("right_attach",-1);
-- int top_attach=ch.getIntProperty("top_attach",-1);
-- int bottom_attach=ch.getIntProperty("bottom_attach",-1);
-+ int left_attach=ch.getIntProperty("left_attach",0);
-+ int right_attach=ch.getIntProperty("right_attach",1);
-+ int top_attach=ch.getIntProperty("top_attach",0);
-+ int bottom_attach=ch.getIntProperty("bottom_attach",1);
-
- std::string xoptions = getAttachOptions(ch, "x");
- std::string yoptions = getAttachOptions(ch, "y");
diff --git a/patches/glademm-2.6.0/fix_double_qualification.diff b/patches/glademm-2.6.0/fix_double_qualification.diff
deleted file mode 100644
index 3555428..0000000
--- a/patches/glademm-2.6.0/fix_double_qualification.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Subject: take out double qualification of function
-By: Debian packet author
- IsSubwidget() is double qualified. Newer Compilers(tested with 4.1.2) don't
- like this and break up with error on this.
- This patch is taken from debian source packet
-
-Signed-off-by: n.a.
----
- src/writers/gnome_app.hh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: b/src/writers/gnome_app.hh
-===================================================================
---- a/src/writers/gnome_app.hh
-+++ b/src/writers/gnome_app.hh
-@@ -28,7 +28,7 @@ class Gnome_App : public Gtk_Window
- virtual bool NeedExplicitCtor(const Widget &w) const;
- virtual void ConstructionArgs(const Widget &w, CxxFile &f) const;
- virtual void Configure(const Widget &w, CxxFile &f,const std::string &instance) const;
-- virtual Subwidget Gnome_App::IsSubwidget(const Widget &w,const Widget &ch) const;
-+ virtual Subwidget IsSubwidget(const Widget &w,const Widget &ch) const;
- virtual const std::string InternalInstance(const Widget &parent,const Widget &w2) const;
- virtual void AddChildren(const Widget &w,CxxFile &f,const std::string &instance,const WriterBase &writer_for_subw, const Widget &widget_for_subw) const;
- };
diff --git a/patches/glademm-2.6.0/gettext-param.diff b/patches/glademm-2.6.0/gettext-param.diff
deleted file mode 100644
index 5f76b76..0000000
--- a/patches/glademm-2.6.0/gettext-param.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-Subject: add --gettext to enable gettext support
-From: Michael Olbrich <m.olbrich@pengutronix.de>
- gettext support is usually auto detected. When using --glade-only
- all autodetection is disabled. This patch allows to manually enable
- gettext support.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/glade--.cc | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-Index: b/src/glade--.cc
-===================================================================
---- a/src/glade--.cc
-+++ b/src/glade--.cc
-@@ -94,6 +94,7 @@ const static struct option options[]=
- { "show-options", no_argument, NULL, SHOW_OPTIONS },
- { "image-provider", required_argument, NULL, IMAGE_PROVIDER },
- { "pkgconfig", required_argument, NULL, 'p' },
-+ { "gettext", no_argument, NULL, 't' },
- { NULL, 0, NULL, 0 }
- };
-
-@@ -404,6 +405,8 @@ int main(int argc,char **argv)
- break;
- case 'p': Configuration.pkgconfig_bin=optarg;
- break;
-+ case 't': Configuration.gettext_support=true;
-+ break;
- case 'V': std::cout<< "glademm V"VERSION" (glade to Gtk-- converter)\n";
- return 0;
- break;
-@@ -547,7 +550,7 @@ reopen:
- if (name.substr(name.size()-6,6)==".glade") name=name.substr(0,name.size()-6);
- t.push_back(Tag("program_name",name));
- t.push_back(Tag("gnome_support","false"));
-- t.push_back(Tag("gettext_support","false"));
-+ t.push_back(Tag("gettext_support",Configuration.gettext_support ? "true" : "false"));
- ApplyProject(t);
- }
- }
diff --git a/patches/glademm-2.6.0/gwt-support.diff b/patches/glademm-2.6.0/gwt-support.diff
deleted file mode 100644
index 17a4bcf..0000000
--- a/patches/glademm-2.6.0/gwt-support.diff
+++ /dev/null
@@ -1,156 +0,0 @@
-Subject: Add support for gwt
-From: Michael Olbrich <m.olbrich@pengutronix.de>
- Produce code for all gwt widgets.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/writers/Makefile.am | 1
- src/writers/WriterBase.cc | 9 +++--
- src/writers/WriterBase.hh | 3 +
- src/writers/gwt.cc | 80 ++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 89 insertions(+), 4 deletions(-)
-
-Index: b/src/writers/gwt.cc
-===================================================================
---- /dev/null
-+++ b/src/writers/gwt.cc
-@@ -0,0 +1,80 @@
-+// $Id: gwt.cc,v 1.14 2002/05/14 08:25:44 christof Exp $
-+/* glade--: C++ frontend for glade (Gtk+ User Interface Builder)
-+ * Copyright (C) 1998 Christof Petig
-+ * Copyright (C) 1999-2000 Adolf Petig GmbH & Co. KG, written by Christof Petig
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ */
-+
-+#include "drawingarea.hh"
-+
-+class Gwt_PlotCanvas : public Gtk_DrawingArea
-+{public:
-+ typedef Gtk_DrawingArea Parent;
-+ virtual const std::string TypeName(const Widget &w) const;
-+ virtual const std::string IncludeName(const Widget &w) const;
-+ Gwt_PlotCanvas();
-+ virtual bool NeedExplicitCtor(const Widget &w) const
-+ { return false; }
-+ virtual void ConstructionArgs(Widget const &w, CxxFile &f) const
-+ { f.FunctionArg(); }
-+};
-+
-+static Gwt_PlotCanvas Gwt_PlotCanvas;
-+
-+const std::string Gwt_PlotCanvas::TypeName(const Widget &w) const
-+{ return "Gwt::PlotCanvas";
-+}
-+
-+const std::string Gwt_PlotCanvas::IncludeName(const Widget &w) const
-+{ return "gwtmm/gwtmm.h";
-+}
-+
-+Gwt_PlotCanvas::Gwt_PlotCanvas()
-+{ Writer["GwtPlotCanvas"]=this;
-+}
-+
-+class Gwt_PlotScale : public Gtk_DrawingArea
-+{public:
-+ typedef Gtk_DrawingArea Parent;
-+ virtual const std::string TypeName(const Widget &w) const;
-+ virtual const std::string IncludeName(const Widget &w) const;
-+ Gwt_PlotScale();
-+ virtual void Configure(const Widget &w, CxxFile &f,const std::string &instance) const;
-+ virtual bool NeedExplicitCtor(const Widget &w) const
-+ { return false; }
-+ virtual void ConstructionArgs(Widget const &w, CxxFile &f) const
-+ { f.FunctionArg(); }
-+};
-+
-+static Gwt_PlotScale Gwt_PlotScale;
-+
-+const std::string Gwt_PlotScale::TypeName(const Widget &w) const
-+{ return "Gwt::PlotScale";
-+}
-+
-+const std::string Gwt_PlotScale::IncludeName(const Widget &w) const
-+{ return "gwtmm/gwtmm.h";
-+}
-+
-+Gwt_PlotScale::Gwt_PlotScale()
-+{ Writer["GwtPlotScale"]=this;
-+}
-+
-+void Gwt_PlotScale::Configure(const Widget &w, CxxFile &f,const std::string &instance) const
-+{ Parent::Configure(w,f,instance);
-+ WriteEnumPropertyNS(w,f,instance, "scale_type", false, "type");
-+}
-+
-Index: b/src/writers/Makefile.am
-===================================================================
---- a/src/writers/Makefile.am
-+++ b/src/writers/Makefile.am
-@@ -25,6 +25,7 @@ noinst_HEADERS = WriterBase.hh adjustmen
- togglebutton.hh toolitem.hh widget.hh window.hh safemap.hh
-
- libwriters_a_SOURCES = WriterBase.cc WriterBase_matches.cc Class.cc \
-+ gwt.cc \
- accellabel.cc \
- accelgroup.cc adjustment.cc alignment.cc arrow.cc \
- aspectframe.cc bbox.cc bonobo_dock.cc bonobo_dockitem.cc \
-Index: b/src/writers/WriterBase.cc
-===================================================================
---- a/src/writers/WriterBase.cc
-+++ b/src/writers/WriterBase.cc
-@@ -322,15 +322,17 @@ void WriterBase::WriteTranslatableProper
- }
- }
-
--void WriterBase::WriteEnumPropertyNS(const Widget &w, CxxFile &f, const std::string &instance, const std::string &property, bool only_new)
--{ if (w.hasProperty(property))
-+void WriterBase::WriteEnumPropertyNS(const Widget &w, CxxFile &f, const std::string &instance, const std::string &property,
-+ bool only_new, std::string functname)
-+{ if (functname.empty()) functname=property;
-+ if (w.hasProperty(property))
- { f.Statement() << instance;
- std::string val=Gtkmm2Namespace(w.getProperty(property));
- if (only_new && GTKMM2)
- f << "property_" << property << "().set_value("
- << val << ')';
- else
-- f << "set_" << property << '('
-+ f << "set_" << functname << '('
- << val << ')';
- }
- }
-@@ -436,6 +438,7 @@ std::string WriterBase::Gtkmm2Namespace(
- std::string res=s;
- replace_all(res,"GTK_","Gtk::");
- replace_all(res,"GDK_","Gdk::");
-+ replace_all(res,"GWT_","Gwt::");
- return res;
- }
-
-Index: b/src/writers/WriterBase.hh
-===================================================================
---- a/src/writers/WriterBase.hh
-+++ b/src/writers/WriterBase.hh
-@@ -186,7 +186,8 @@ public: // for new property based code
- static void WriteTranslatableProperty(const Widget &w, CxxFile &f, const std::string &instance, const std::string &property, bool only_new=false);
- static void WriteBoolProperty(const Widget &w, CxxFile &f, const std::string &instance, const std::string &property,
- bool only_new=false, std::string functname="");
-- static void WriteEnumPropertyNS(const Widget &w, CxxFile &f, const std::string &instance, const std::string &property, bool only_new=false);
-+ static void WriteEnumPropertyNS(const Widget &w, CxxFile &f, const std::string &instance, const std::string &property,
-+ bool only_new=false, std::string functname="");
- static void WriteIntProperty(const Widget &w, CxxFile &f, const std::string &instance, const std::string &property,
- bool only_new=false, std::string functname="");
- static void WriteIntIntProperty(const Widget &w, CxxFile &f, const std::string &instance,
diff --git a/patches/glademm-2.6.0/series b/patches/glademm-2.6.0/series
deleted file mode 100644
index 8334c1b..0000000
--- a/patches/glademm-2.6.0/series
+++ /dev/null
@@ -1,9 +0,0 @@
-fix_double_qualification.diff
-configurable_pkgconfig.diff
-box_pack_child_with_responseid.diff
-fix-glade-only.diff
-fix-table-attach.diff
-fix-alignment-writer.diff
-gettext-param.diff
-gwt-support.diff
-fix-for-new-gcc.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 26/28] gpsd: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (23 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 25/28] glademm: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 27/28] gst-plugins-gl: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 28/28] gtk: " Robert Schwebel
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
...001-fix-core-compiling-with-nmea-disabled.patch | 31 ++++++
...-breakage-if-some-drivers-are-not-enabled.patch | 50 +++++++++
.../0003-fix-a-simple-compile-error.patch | 30 ++++++
patches/gpsd-2.39/0004-Fix-autotool-bug.patch | 55 ++++++++++
...-rely-on-AM_PATH_PYTHON-to-work-propperly.patch | 108 ++++++++++++++++++++
patches/gpsd-2.39/0006-fix-parallel-build.patch | 42 ++++++++
.../gpsd-2.39-configure_ac-fix-python.diff | 104 -------------------
patches/gpsd-2.39/gpsd-2.39-fix-autotool-bug.diff | 55 ----------
...2.39-fix-core-compiling-with-nmea-disabled.diff | 32 ------
...k-breakage-if-some-drivers-are-not-enabled.diff | 50 ---------
patches/gpsd-2.39/gpsd-2.39-fix_build_error.diff | 29 -----
.../gpsd-2.39-fixup-parallel-build-for-python.diff | 38 -------
patches/gpsd-2.39/series | 6 -
13 files changed, 316 insertions(+), 314 deletions(-)
create mode 100644 patches/gpsd-2.39/0001-fix-core-compiling-with-nmea-disabled.patch
create mode 100644 patches/gpsd-2.39/0002-fix-link-breakage-if-some-drivers-are-not-enabled.patch
create mode 100644 patches/gpsd-2.39/0003-fix-a-simple-compile-error.patch
create mode 100644 patches/gpsd-2.39/0004-Fix-autotool-bug.patch
create mode 100644 patches/gpsd-2.39/0005-just-rely-on-AM_PATH_PYTHON-to-work-propperly.patch
create mode 100644 patches/gpsd-2.39/0006-fix-parallel-build.patch
delete mode 100644 patches/gpsd-2.39/gpsd-2.39-configure_ac-fix-python.diff
delete mode 100644 patches/gpsd-2.39/gpsd-2.39-fix-autotool-bug.diff
delete mode 100644 patches/gpsd-2.39/gpsd-2.39-fix-core-compiling-with-nmea-disabled.diff
delete mode 100644 patches/gpsd-2.39/gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.diff
delete mode 100644 patches/gpsd-2.39/gpsd-2.39-fix_build_error.diff
delete mode 100644 patches/gpsd-2.39/gpsd-2.39-fixup-parallel-build-for-python.diff
delete mode 100644 patches/gpsd-2.39/series
diff --git a/patches/gpsd-2.39/0001-fix-core-compiling-with-nmea-disabled.patch b/patches/gpsd-2.39/0001-fix-core-compiling-with-nmea-disabled.patch
new file mode 100644
index 0000000..1df2540
--- /dev/null
+++ b/patches/gpsd-2.39/0001-fix-core-compiling-with-nmea-disabled.patch
@@ -0,0 +1,31 @@
+From cd7bac7bb5b1b8794478345baf6f3303faf63fc1 Mon Sep 17 00:00:00 2001
+From: Luotao Fu <l.fu@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:33:40 +0100
+Subject: [PATCH 1/6] fix core compiling with nmea disabled
+
+struct nmea is only defined in the driver union if NMEA_ENABLED is set.
+libpgsd_core however acquires if the ignore_trailing_edge in nmea is set
+or not carelessly if NMEA_ENABLED is set. Add an additional ifdef of
+NMEA_ENABLE to fix this.
+
+Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
+---
+ libgpsd_core.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libgpsd_core.c b/libgpsd_core.c
+index 28f787d..4109369 100644
+--- a/libgpsd_core.c
++++ b/libgpsd_core.c
+@@ -206,7 +206,7 @@ static /*@null@*/void *gpsd_ppsmonitor(void *arg)
+ } else if (cycle > 999000 && cycle < 1001000 ) {
+ /* looks like PPS pulse or square wave */
+ if (duration > 499000 && duration < 501000
+-#ifdef GPSCLOCK_ENABLE
++#if defined(NMEA_ENABLE) && defined(GPSCLOCK_ENABLE)
+ && session->driver.nmea.ignore_trailing_edge
+ #endif /* GPSCLOCK_ENABLE */
+ ) {
+--
+1.7.7
+
diff --git a/patches/gpsd-2.39/0002-fix-link-breakage-if-some-drivers-are-not-enabled.patch b/patches/gpsd-2.39/0002-fix-link-breakage-if-some-drivers-are-not-enabled.patch
new file mode 100644
index 0000000..486235e
--- /dev/null
+++ b/patches/gpsd-2.39/0002-fix-link-breakage-if-some-drivers-are-not-enabled.patch
@@ -0,0 +1,50 @@
+From b33c47ccc78040f4ef878b7c7abe5b22a19583d6 Mon Sep 17 00:00:00 2001
+From: Luotao Fu <l.fu@pengutronix.de>
+Date: Thu, 23 Apr 2009 18:18:54 +0200
+Subject: [PATCH 2/6] fix link breakage if some drivers are not enabled
+
+rtcm*_unpack and rtcm*_dump functions are only declared if the rtcm drivers are
+enabled during configuration. The same for aivdm. If these drivers are not
+enabled, linking will fail due to unknow reference. Add some ifdefs to avoid
+this. This is ugly ifdef hell. It'd be way eleganter to change the structures in
+driver code and put some function pointer checking in here. Due to lack of time
+I only did this quick hack. Better ideas are highly welcome.
+
+Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
+---
+ gpsdecode.c | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/gpsdecode.c b/gpsdecode.c
+index ffe898b..e18c698 100644
+--- a/gpsdecode.c
++++ b/gpsdecode.c
+@@ -57,19 +57,25 @@ static void decode(FILE *fpin, FILE *fpout)
+ else if (lexer.type == COMMENT_PACKET)
+ continue;
+ else if (lexer.type == RTCM2_PACKET) {
++#if defined(RTCM104V2_ENABLE)
+ rtcm2_unpack(&rtcm2, (char *)lexer.isgps.buf);
+ rtcm2_dump(&rtcm2, buf, sizeof(buf));
+ (void)fputs(buf, fpout);
++#endif
+ }
+ else if (lexer.type == RTCM3_PACKET) {
++#if defined(RTCM104V3_ENABLE)
+ rtcm3_unpack(&rtcm3, (char *)lexer.outbuffer);
+ rtcm3_dump(&rtcm3, stdout);
++#endif
+ }
+ else if (lexer.type == AIVDM_PACKET) {
++#if defined(aivdm_dump)
+ /*@ -uniondef */
+ if (aivdm_decode((char *)lexer.outbuffer, lexer.outbuflen, &aivdm))
+ aivdm_dump(&aivdm.decoded, scaled, labeled, stdout);
+ /*@ +uniondef */
++#endif
+ }
+ }
+ }
+--
+1.7.7
+
diff --git a/patches/gpsd-2.39/0003-fix-a-simple-compile-error.patch b/patches/gpsd-2.39/0003-fix-a-simple-compile-error.patch
new file mode 100644
index 0000000..8feb764
--- /dev/null
+++ b/patches/gpsd-2.39/0003-fix-a-simple-compile-error.patch
@@ -0,0 +1,30 @@
+From ce1f2edcdae7c7f1406d657cfa83d1608062bc60 Mon Sep 17 00:00:00 2001
+From: Juergen Beisert <jbeisert@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:33:40 +0100
+Subject: [PATCH 3/6] fix a simple compile error
+
+This fixes the following compile error:
+
+.libs/drivers.o drivers.c:938: error: expected '}' before ';' token
+
+Signed-off-by: Juergen Beisert <jbeisert@pengutronix.de>
+---
+ drivers.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers.c b/drivers.c
+index 89cd772..373476f 100644
+--- a/drivers.c
++++ b/drivers.c
+@@ -935,7 +935,7 @@ static gps_mask_t garmintxt_parse_input(struct gps_device_t *session)
+
+ static const struct gps_type_t garmintxt = {
+ .type_name = "Garmin Simple Text", /* full name of type */
+- .packet_type = RTCM2_PACKET; /* associated lexer packet type */
++ .packet_type = RTCM2_PACKET, /* associated lexer packet type */
+ .trigger = NULL, /* no recognition string */
+ .channels = 0, /* not used */
+ .probe_wakeup = NULL, /* no wakeup to be done before hunt */
+--
+1.7.7
+
diff --git a/patches/gpsd-2.39/0004-Fix-autotool-bug.patch b/patches/gpsd-2.39/0004-Fix-autotool-bug.patch
new file mode 100644
index 0000000..4272d74
--- /dev/null
+++ b/patches/gpsd-2.39/0004-Fix-autotool-bug.patch
@@ -0,0 +1,55 @@
+From 5308d2d0dff67a19a5b5f8c5793f5c4f8e366038 Mon Sep 17 00:00:00 2001
+From: Luotao Fu <l.fu@pengutronix.de>
+Date: Thu, 23 Apr 2009 15:15:21 +0200
+Subject: [PATCH 4/6] Fix autotool bug
+
+Original by Richard Hansen:
+Autoconf has a longstanding bug in AC_REQUIRE that causes out-of-order
+macro expansion problems. This patch works around the Autoconf bug.
+
+lfu:
+This one fixes the configure script fails if run with --disable-python.
+Some macro needed by dependency tracker is errorneously expanded inside the
+python check condition, which cause that these will be failed to be set if
+python is not enabled.
+
+Signed-off-by: FIXME
+---
+ configure.ac | 21 +++++++++++++++++++++
+ 1 files changed, 21 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7db2a6c..67e9253 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,6 +5,27 @@ dnl AC_PREFIX_PROGRAM(gcc)
+ AM_CONFIG_HEADER(gpsd_config.h)
+ AC_LANG([C])
+
++# ACREQUIRE_BUGFIX
++# ----------------
++# Due to a longstanding Autoconf bug (Autoconf 2.50 to at least 2.63),
++# any macro that is AC_REQUIREd at any point must be AC_REQUIREd
++# *before* it is directly expanded. The macros below were being
++# directly expanded before being AC_REQUIREd, so we AC_REQUIRE them
++# early to prevent out-of-order expansion problems. See the threads
++# at:
++# http://lists.gnu.org/archive/html/bug-autoconf/2008-12/msg00039.html
++# http://lists.gnu.org/archive/html/autoconf-patches/2008-12/msg00058.html
++# http://lists.gnu.org/archive/html/bug-autoconf/2009-01/msg00019.html
++# http://lists.gnu.org/archive/html/bug-gnulib/2009-01/msg00247.html
++AC_DEFUN_ONCE([ACREQUIRE_BUGFIX],
++[
++ AC_REQUIRE([AC_PROG_CPP])
++ AC_REQUIRE([AC_PROG_EGREP])
++ AC_REQUIRE([AC_PROG_CC])
++])
++ACREQUIRE_BUGFIX
++# ACREQUIRE_BUGFIX done
++
+ AC_ARG_ENABLE(python,
+ AC_HELP_STRING([--disable-python],
+ [disable python scripts and library bindings]),
+--
+1.7.7
+
diff --git a/patches/gpsd-2.39/0005-just-rely-on-AM_PATH_PYTHON-to-work-propperly.patch b/patches/gpsd-2.39/0005-just-rely-on-AM_PATH_PYTHON-to-work-propperly.patch
new file mode 100644
index 0000000..de0366a
--- /dev/null
+++ b/patches/gpsd-2.39/0005-just-rely-on-AM_PATH_PYTHON-to-work-propperly.patch
@@ -0,0 +1,108 @@
+From 4d84d4119e2cde0ce062bc7c7db1709845fcca97 Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:33:40 +0100
+Subject: [PATCH 5/6] just rely on AM_PATH_PYTHON to work propperly
+
+remove hand crafted python detection and detection of
+PYTHON_LIBS and PYTHON_CFLAGS, they are not used anyway.
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ configure.ac | 77 ++++------------------------------------------------------
+ 1 files changed, 5 insertions(+), 72 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 67e9253..08f99a8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,82 +27,15 @@ ACREQUIRE_BUGFIX
+ # ACREQUIRE_BUGFIX done
+
+ AC_ARG_ENABLE(python,
+- AC_HELP_STRING([--disable-python],
++ AS_HELP_STRING([--disable-python],
+ [disable python scripts and library bindings]),
+ [try_python="$enableval"], [try_python="yes"])
+-if test "x$try_python" = "xyes"; then
+- AM_PATH_PYTHON
+- ac_python=yes
+- if test "x$PYTHON" = "x"; then
+- AC_PATH_PROG(PYTHON, python, none)
+- fi
+-
+- if test "x$PYTHON" = "xnone"; then
+- AC_MSG_WARN([*** Python interpreter not found, Python support disabled.])
+- ac_python=no
+- fi
+-
+- if test "x$ac_python" = "xyes"; then
+- AC_MSG_CHECKING(Python version and location)
+- PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
+- PYTHON_VERSION_MAJOR=[`$PYTHON -c "import sys; print '%d' % (sys.version_info[0]);"`]
+- PYTHON_VERSION_MINOR=[`$PYTHON -c "import sys; print '%d' % (sys.version_info[1]);"`]
+- PYTHON_VERSION="${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}"
+- AC_MSG_RESULT([$PYTHON, $PYTHON_VERSION, $PYTHON_PREFIX])
+-
+- AC_MSG_CHECKING(whether Python is at least 2.4)
+- if test $PYTHON_VERSION_MAJOR -lt 2 -o $PYTHON_VERSION_MAJOR -eq 2 -a $PYTHON_VERSION_MINOR -lt 3; then
+- AC_MSG_RESULT(no)
+- AC_MSG_WARN([*** GPSD requires at least Python 2.3, Python support disabled.])
+- ac_python=no
+- fi
+- if test "x$ac_python" = "xyes"; then
+- AC_MSG_RESULT(yes)
+-
+- PYTHON_CFLAGS="-DHAVE_PYTHON -I$PYTHON_PREFIX/include/python$PYTHON_VERSION"
+-
+- OLD_CPPFLAGS="$CPPFLAGS"
+- OLD_CXXFLAGS="$CXXFLAGS"
+- CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
+- CXXFLAGS="$CXXFLAGS $PYTHON_CFLAGS"
+-
+- AC_CHECK_HEADERS([Python.h],
+- [],
+- [AC_MSG_WARN([*** Python include files not found! You should install the Python development package. Python support disabled]); ac_python=no])
+- CPPFLAGS="$OLD_CPPFLAGS"
+- CXXFLAGS="$OLD_CXXFLAGS"
+
+- if test "x$ac_python" = "xyes"; then
+- AC_SUBST([PYTHON_CFLAGS])
+-
+- ac_python=no
+- for pylibpath in '/usr/lib' $PYTHON_PREFIX/lib $PYTHON_PREFIX/lib/python$PYTHON_VERSION/config; do
+- eval `echo unset ac_cv_lib_python$PYTHON_VERSION'___'Py_Finalize | tr '.' '_'`
+-
+- save_LIBS=$LIBS
+- LIBS="$LIBS -L$pylibpath $PYTHON_LIBS"
+- AC_CHECK_LIB(python$PYTHON_VERSION, Py_Finalize, PYTHON_LIBS="-L$pylibpath -lpython$PYTHON_VERSION $PYTHON_DEPS"; ac_python=yes,,$PYTHON_DEPS)
+- LIBS=$save_LIBS
+- if test "x$ac_python" = "xyes"; then
+- break
+- fi
+- done
+-
+- if test "x$ac_python" != "xyes"; then
+- AC_MSG_WARN(*** Python development libraries required, Python support disabled)
+- fi
+- AC_SUBST([PYTHON_LIBS])
+-
+- AC_SUBST(pkgpythondir)
+- if test "x$python_install" = "xyes"; then
+- pkgpythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION"/site-packages/gpsd"
+- fi
+-
+- fi
+- fi
+- fi
++if test "x$try_python" = "xyes"; then
++ AM_PATH_PYTHON([2.4], [have_python=yes], [have_python=no])
+ fi
+-AM_CONDITIONAL([HAVE_PYTHON], [test x"$ac_python" = xyes])
++
++AM_CONDITIONAL([HAVE_PYTHON], [test "${have_python}" = "yes"])
+
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+--
+1.7.7
+
diff --git a/patches/gpsd-2.39/0006-fix-parallel-build.patch b/patches/gpsd-2.39/0006-fix-parallel-build.patch
new file mode 100644
index 0000000..e59bd2f
--- /dev/null
+++ b/patches/gpsd-2.39/0006-fix-parallel-build.patch
@@ -0,0 +1,42 @@
+From 791a4226f7c3f422e466efaedf61d880325bdf18 Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:33:40 +0100
+Subject: [PATCH 6/6] fix parallel build
+
+The build system has a race with the creation of the python bindings; if
+both targets of the "gpspacket.so gpslib.so:" rule are started at the
+same time, the build "sometimes" breaks; this can be triggered with only
+a few cycles when built with -j16 on a 8-way box.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ Makefile.am | 9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 05e31f0..818c57a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -187,12 +187,17 @@ if HAVE_PYTHON
+ PYEXTENSIONS = gpspacket.so gpslib.so
+ noinst_SCRIPTS = gpspacket.so gpslib.so setup.py
+
+-gpspacket.so gpslib.so: gpspacket.c gpslib.c libgps.la
++.PHONY: build_python_ext
++build_python_ext: gpspacket.c gpslib.c libgps.la
+ (pwd="`pwd`"; cd $(srcdir) && $(PYTHON) setup.py build_ext --build-lib "$$pwd" --build-temp "$$pwd/build" --include-dirs "$$pwd")
+-endif
++
++gpspacket.so: build_python_ext
++gpslib.so: build_python_ext
++
+ # Clean up after Python
+ clean-local:
+ rm -rf build
++endif
+
+ #
+ # Build test_gpsmm
+--
+1.7.7
+
diff --git a/patches/gpsd-2.39/gpsd-2.39-configure_ac-fix-python.diff b/patches/gpsd-2.39/gpsd-2.39-configure_ac-fix-python.diff
deleted file mode 100644
index 121093e..0000000
--- a/patches/gpsd-2.39/gpsd-2.39-configure_ac-fix-python.diff
+++ /dev/null
@@ -1,104 +0,0 @@
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Subject: just rely on AM_PATH_PYTHON to work propperly
-
-remove hand crafted python detection and detection of
-PYTHON_LIBS and PYTHON_CFLAGS, they are not used anyway.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-
----
- configure.ac | 77 +++--------------------------------------------------------
- 1 file changed, 5 insertions(+), 72 deletions(-)
-
-Index: gpsd-2.39/configure.ac
-===================================================================
---- gpsd-2.39.orig/configure.ac
-+++ gpsd-2.39/configure.ac
-@@ -27,82 +27,15 @@ ACREQUIRE_BUGFIX
- # ACREQUIRE_BUGFIX done
-
- AC_ARG_ENABLE(python,
-- AC_HELP_STRING([--disable-python],
-+ AS_HELP_STRING([--disable-python],
- [disable python scripts and library bindings]),
- [try_python="$enableval"], [try_python="yes"])
--if test "x$try_python" = "xyes"; then
-- AM_PATH_PYTHON
-- ac_python=yes
-- if test "x$PYTHON" = "x"; then
-- AC_PATH_PROG(PYTHON, python, none)
-- fi
--
-- if test "x$PYTHON" = "xnone"; then
-- AC_MSG_WARN([*** Python interpreter not found, Python support disabled.])
-- ac_python=no
-- fi
--
-- if test "x$ac_python" = "xyes"; then
-- AC_MSG_CHECKING(Python version and location)
-- PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
-- PYTHON_VERSION_MAJOR=[`$PYTHON -c "import sys; print '%d' % (sys.version_info[0]);"`]
-- PYTHON_VERSION_MINOR=[`$PYTHON -c "import sys; print '%d' % (sys.version_info[1]);"`]
-- PYTHON_VERSION="${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}"
-- AC_MSG_RESULT([$PYTHON, $PYTHON_VERSION, $PYTHON_PREFIX])
--
-- AC_MSG_CHECKING(whether Python is at least 2.4)
-- if test $PYTHON_VERSION_MAJOR -lt 2 -o $PYTHON_VERSION_MAJOR -eq 2 -a $PYTHON_VERSION_MINOR -lt 3; then
-- AC_MSG_RESULT(no)
-- AC_MSG_WARN([*** GPSD requires at least Python 2.3, Python support disabled.])
-- ac_python=no
-- fi
-- if test "x$ac_python" = "xyes"; then
-- AC_MSG_RESULT(yes)
-
-- PYTHON_CFLAGS="-DHAVE_PYTHON -I$PYTHON_PREFIX/include/python$PYTHON_VERSION"
--
-- OLD_CPPFLAGS="$CPPFLAGS"
-- OLD_CXXFLAGS="$CXXFLAGS"
-- CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
-- CXXFLAGS="$CXXFLAGS $PYTHON_CFLAGS"
--
-- AC_CHECK_HEADERS([Python.h],
-- [],
-- [AC_MSG_WARN([*** Python include files not found! You should install the Python development package. Python support disabled]); ac_python=no])
-- CPPFLAGS="$OLD_CPPFLAGS"
-- CXXFLAGS="$OLD_CXXFLAGS"
--
-- if test "x$ac_python" = "xyes"; then
-- AC_SUBST([PYTHON_CFLAGS])
--
-- ac_python=no
-- for pylibpath in '/usr/lib' $PYTHON_PREFIX/lib $PYTHON_PREFIX/lib/python$PYTHON_VERSION/config; do
-- eval `echo unset ac_cv_lib_python$PYTHON_VERSION'___'Py_Finalize | tr '.' '_'`
--
-- save_LIBS=$LIBS
-- LIBS="$LIBS -L$pylibpath $PYTHON_LIBS"
-- AC_CHECK_LIB(python$PYTHON_VERSION, Py_Finalize, PYTHON_LIBS="-L$pylibpath -lpython$PYTHON_VERSION $PYTHON_DEPS"; ac_python=yes,,$PYTHON_DEPS)
-- LIBS=$save_LIBS
-- if test "x$ac_python" = "xyes"; then
-- break
-- fi
-- done
--
-- if test "x$ac_python" != "xyes"; then
-- AC_MSG_WARN(*** Python development libraries required, Python support disabled)
-- fi
-- AC_SUBST([PYTHON_LIBS])
--
-- AC_SUBST(pkgpythondir)
-- if test "x$python_install" = "xyes"; then
-- pkgpythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION"/site-packages/gpsd"
-- fi
--
-- fi
-- fi
-- fi
-+if test "x$try_python" = "xyes"; then
-+ AM_PATH_PYTHON([2.4], [have_python=yes], [have_python=no])
- fi
--AM_CONDITIONAL([HAVE_PYTHON], [test x"$ac_python" = xyes])
-+
-+AM_CONDITIONAL([HAVE_PYTHON], [test "${have_python}" = "yes"])
-
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
diff --git a/patches/gpsd-2.39/gpsd-2.39-fix-autotool-bug.diff b/patches/gpsd-2.39/gpsd-2.39-fix-autotool-bug.diff
deleted file mode 100644
index 4a144e0..0000000
--- a/patches/gpsd-2.39/gpsd-2.39-fix-autotool-bug.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Luotao Fu <l.fu@pengutronix.de>
-Date: Thu, 23 Apr 2009 15:15:21 +0200
-Subject: [PATCH] Fix autotool bug
-
-Original by Richard Hansen:
-Autoconf has a longstanding bug in AC_REQUIRE that causes out-of-order
-macro expansion problems. This patch works around the Autoconf bug.
-
-lfu:
-This one fixes the configure script fails if run with --disable-python.
-Some macro needed by dependency tracker is errorneously expanded inside the
-python check condition, which cause that these will be failed to be set if
-python is not enabled.
-
-Signed-off-by: FIXME
-
----
-
-[20110222 wsa: fixed in master meanwhile]
-
- configure.ac | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-Index: configure.ac
-===================================================================
---- a/configure.ac.orig
-+++ b/configure.ac
-@@ -5,6 +5,27 @@ dnl AC_PREFIX_PROGRAM(gcc)
- AM_CONFIG_HEADER(gpsd_config.h)
- AC_LANG([C])
-
-+# ACREQUIRE_BUGFIX
-+# ----------------
-+# Due to a longstanding Autoconf bug (Autoconf 2.50 to at least 2.63),
-+# any macro that is AC_REQUIREd at any point must be AC_REQUIREd
-+# *before* it is directly expanded. The macros below were being
-+# directly expanded before being AC_REQUIREd, so we AC_REQUIRE them
-+# early to prevent out-of-order expansion problems. See the threads
-+# at:
-+# http://lists.gnu.org/archive/html/bug-autoconf/2008-12/msg00039.html
-+# http://lists.gnu.org/archive/html/autoconf-patches/2008-12/msg00058.html
-+# http://lists.gnu.org/archive/html/bug-autoconf/2009-01/msg00019.html
-+# http://lists.gnu.org/archive/html/bug-gnulib/2009-01/msg00247.html
-+AC_DEFUN_ONCE([ACREQUIRE_BUGFIX],
-+[
-+ AC_REQUIRE([AC_PROG_CPP])
-+ AC_REQUIRE([AC_PROG_EGREP])
-+ AC_REQUIRE([AC_PROG_CC])
-+])
-+ACREQUIRE_BUGFIX
-+# ACREQUIRE_BUGFIX done
-+
- AC_ARG_ENABLE(python,
- AC_HELP_STRING([--disable-python],
- [disable python scripts and library bindings]),
diff --git a/patches/gpsd-2.39/gpsd-2.39-fix-core-compiling-with-nmea-disabled.diff b/patches/gpsd-2.39/gpsd-2.39-fix-core-compiling-with-nmea-disabled.diff
deleted file mode 100644
index b487ea5..0000000
--- a/patches/gpsd-2.39/gpsd-2.39-fix-core-compiling-with-nmea-disabled.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Luotao Fu <l.fu@pengutronix.de>
-Subject: [PATCH] fix core compiling with nmea disabled
-
-struct nmea is only defined in the driver union if NMEA_ENABLED is set.
-libpgsd_core however acquires if the ignore_trailing_edge in nmea is set
-or not carelessly if NMEA_ENABLED is set. Add an additional ifdef of
-NMEA_ENABLE to fix this.
-
-Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
----
-
-[20110222 wsa: fixed in master meanwhile]
-
- libgpsd_core.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libgpsd_core.c b/libgpsd_core.c
-index 8220eae..71dd5ba 100644
---- a/libgpsd_core.c
-+++ b/libgpsd_core.c
-@@ -206,7 +206,7 @@ static /*@null@*/void *gpsd_ppsmonitor(void *arg)
- } else if (cycle > 999000 && cycle < 1001000 ) {
- /* looks like PPS pulse or square wave */
- if (duration > 499000 && duration < 501000
--#ifdef GPSCLOCK_ENABLE
-+#if defined(NMEA_ENABLE) && defined(GPSCLOCK_ENABLE)
- && session->driver.nmea.ignore_trailing_edge
- #endif /* GPSCLOCK_ENABLE */
- ) {
---
-1.6.2.1
-
diff --git a/patches/gpsd-2.39/gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.diff b/patches/gpsd-2.39/gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.diff
deleted file mode 100644
index 5e832a2..0000000
--- a/patches/gpsd-2.39/gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-From dbc28fc8a50f47329ce7e579e35629318f95bf4b Mon Sep 17 00:00:00 2001
-From: Luotao Fu <l.fu@pengutronix.de>
-Date: Thu, 23 Apr 2009 18:18:54 +0200
-Subject: [PATCH] fix link breakage if some drivers are not enabled
-
-rtcm*_unpack and rtcm*_dump functions are only declared if the rtcm drivers are
-enabled during configuration. The same for aivdm. If these drivers are not
-enabled, linking will fail due to unknow reference. Add some ifdefs to avoid
-this. This is ugly ifdef hell. It'd be way eleganter to change the structures in
-driver code and put some function pointer checking in here. Due to lack of time
-I only did this quick hack. Better ideas are highly welcome.
-
-Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
----
-
-[20110222 wsa: fixed in master meanwhile. Like this.]
-
- gpsdecode.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-Index: gpsd-2.39/gpsdecode.c
-===================================================================
---- gpsd-2.39/gpsdecode.c.orig
-+++ gpsd-2.39/gpsdecode.c
-@@ -57,19 +57,25 @@ static void decode(FILE *fpin, FILE *fpo
- else if (lexer.type == COMMENT_PACKET)
- continue;
- else if (lexer.type == RTCM2_PACKET) {
-+#if defined(RTCM104V2_ENABLE)
- rtcm2_unpack(&rtcm2, (char *)lexer.isgps.buf);
- rtcm2_dump(&rtcm2, buf, sizeof(buf));
- (void)fputs(buf, fpout);
-+#endif
- }
- else if (lexer.type == RTCM3_PACKET) {
-+#if defined(RTCM104V3_ENABLE)
- rtcm3_unpack(&rtcm3, (char *)lexer.outbuffer);
- rtcm3_dump(&rtcm3, stdout);
-+#endif
- }
- else if (lexer.type == AIVDM_PACKET) {
-+#if defined(aivdm_dump)
- /*@ -uniondef */
- if (aivdm_decode((char *)lexer.outbuffer, lexer.outbuflen, &aivdm))
- aivdm_dump(&aivdm.decoded, scaled, labeled, stdout);
- /*@ +uniondef */
-+#endif
- }
- }
- }
diff --git a/patches/gpsd-2.39/gpsd-2.39-fix_build_error.diff b/patches/gpsd-2.39/gpsd-2.39-fix_build_error.diff
deleted file mode 100644
index 4438e84..0000000
--- a/patches/gpsd-2.39/gpsd-2.39-fix_build_error.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Juergen Beisert <jbeisert@pengutronix.de>
-Subject: [PATCH] fix a simple compile error
-
-This fixes the following compile error:
-
-.libs/drivers.o drivers.c:938: error: expected '}' before ';' token
-
-Signed-off-by: Juergen Beisert <jbeisert@pengutronix.de>
-
----
-
-[20110222 wsa: fixed in master meanwhile]
-
- drivers.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: gpsd-2.39/drivers.c
-===================================================================
---- gpsd-2.39/drivers.c.orig
-+++ gpsd-2.39/drivers.c
-@@ -935,7 +935,7 @@ static gps_mask_t garmintxt_parse_input(
-
- static const struct gps_type_t garmintxt = {
- .type_name = "Garmin Simple Text", /* full name of type */
-- .packet_type = RTCM2_PACKET; /* associated lexer packet type */
-+ .packet_type = RTCM2_PACKET, /* associated lexer packet type */
- .trigger = NULL, /* no recognition string */
- .channels = 0, /* not used */
- .probe_wakeup = NULL, /* no wakeup to be done before hunt */
diff --git a/patches/gpsd-2.39/gpsd-2.39-fixup-parallel-build-for-python.diff b/patches/gpsd-2.39/gpsd-2.39-fixup-parallel-build-for-python.diff
deleted file mode 100644
index 02d7425..0000000
--- a/patches/gpsd-2.39/gpsd-2.39-fixup-parallel-build-for-python.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: [PATCH] fix parallel build
-
-The build system has a race with the creation of the python bindings; if
-both targets of the "gpspacket.so gpslib.so:" rule are started at the
-same time, the build "sometimes" breaks; this can be triggered with only
-a few cycles when built with -j16 on a 8-way box.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- Makefile.am | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-Index: gpsd-2.39/Makefile.am
-===================================================================
---- gpsd-2.39.orig/Makefile.am
-+++ gpsd-2.39/Makefile.am
-@@ -187,12 +187,17 @@ if HAVE_PYTHON
- PYEXTENSIONS = gpspacket.so gpslib.so
- noinst_SCRIPTS = gpspacket.so gpslib.so setup.py
-
--gpspacket.so gpslib.so: gpspacket.c gpslib.c libgps.la
-+.PHONY: build_python_ext
-+build_python_ext: gpspacket.c gpslib.c libgps.la
- (pwd="`pwd`"; cd $(srcdir) && $(PYTHON) setup.py build_ext --build-lib "$$pwd" --build-temp "$$pwd/build" --include-dirs "$$pwd")
--endif
-+
-+gpspacket.so: build_python_ext
-+gpslib.so: build_python_ext
-+
- # Clean up after Python
- clean-local:
- rm -rf build
-+endif
-
- #
- # Build test_gpsmm
diff --git a/patches/gpsd-2.39/series b/patches/gpsd-2.39/series
deleted file mode 100644
index 0340e8d..0000000
--- a/patches/gpsd-2.39/series
+++ /dev/null
@@ -1,6 +0,0 @@
-gpsd-2.39-fix-core-compiling-with-nmea-disabled.diff
-gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.diff
-gpsd-2.39-fix_build_error.diff
-gpsd-2.39-fix-autotool-bug.diff
-gpsd-2.39-configure_ac-fix-python.diff
-gpsd-2.39-fixup-parallel-build-for-python.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 27/28] gst-plugins-gl: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (24 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 26/28] gpsd: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 28/28] gtk: " Robert Schwebel
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
...ake-sure-gtk-example-builds-for-non-X-gtk.patch | 40 ++++++++++++++++++++
.../disable-broken-example.diff | 36 ------------------
patches/gst-plugins-gl-0.10.2/series | 1 -
3 files changed, 40 insertions(+), 37 deletions(-)
create mode 100644 patches/gst-plugins-gl-0.10.2/0001-make-sure-gtk-example-builds-for-non-X-gtk.patch
delete mode 100644 patches/gst-plugins-gl-0.10.2/disable-broken-example.diff
delete mode 100644 patches/gst-plugins-gl-0.10.2/series
diff --git a/patches/gst-plugins-gl-0.10.2/0001-make-sure-gtk-example-builds-for-non-X-gtk.patch b/patches/gst-plugins-gl-0.10.2/0001-make-sure-gtk-example-builds-for-non-X-gtk.patch
new file mode 100644
index 0000000..d29c36e
--- /dev/null
+++ b/patches/gst-plugins-gl-0.10.2/0001-make-sure-gtk-example-builds-for-non-X-gtk.patch
@@ -0,0 +1,40 @@
+From 95bedfa03edb6577d0164569d922063a6ef60c3e Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:37:00 +0100
+Subject: [PATCH] make sure gtk example builds for non X gtk
+
+With this patch tests/examples/gtk/gstgtk.c will compile with non X gtk.
+It won't do anything usefull, though.
+
+Not for upstream.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ tests/examples/gtk/gstgtk.c | 4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/tests/examples/gtk/gstgtk.c b/tests/examples/gtk/gstgtk.c
+index 3a68e19..3d53325 100644
+--- a/tests/examples/gtk/gstgtk.c
++++ b/tests/examples/gtk/gstgtk.c
+@@ -26,8 +26,6 @@
+ #include <gdk/gdkx.h>
+ #elif defined(GDK_WINDOWING_QUARTZ)
+ #include <gdk/gdkquartz.h>
+-#else
+-#error unimplemented GTK backend
+ #endif
+
+
+@@ -42,8 +40,6 @@ gst_x_overlay_set_gtk_window (GstXOverlay *xoverlay, GtkWidget *window)
+ (gulong)gdk_quartz_window_get_nswindow (window->window));
+ #elif defined(GDK_WINDOWING_X11)
+ gst_x_overlay_set_xwindow_id (xoverlay, GDK_WINDOW_XWINDOW(window->window));
+-#else
+-#error unimplemented GTK backend
+ #endif
+
+ }
+--
+1.7.7
+
diff --git a/patches/gst-plugins-gl-0.10.2/disable-broken-example.diff b/patches/gst-plugins-gl-0.10.2/disable-broken-example.diff
deleted file mode 100644
index a4f7647..0000000
--- a/patches/gst-plugins-gl-0.10.2/disable-broken-example.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: make sure gtk example builds for non X gtk
-
-With this patch tests/examples/gtk/gstgtk.c will compile with non X gtk.
-It won't do anything usefull, though.
-
-Not for upstream.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- tests/examples/gtk/gstgtk.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-Index: b/tests/examples/gtk/gstgtk.c
-===================================================================
---- a/tests/examples/gtk/gstgtk.c
-+++ b/tests/examples/gtk/gstgtk.c
-@@ -7,8 +7,6 @@
- #include <gdk/gdkx.h>
- #elif defined(GDK_WINDOWING_QUARTZ)
- #include <gdk/gdkquartz.h>
--#else
--#error unimplemented GTK backend
- #endif
-
-
-@@ -23,8 +21,6 @@ gst_x_overlay_set_gtk_window (GstXOverla
- (gulong)gdk_quartz_window_get_nswindow (window->window));
- #elif defined(GDK_WINDOWING_X11)
- gst_x_overlay_set_xwindow_id (xoverlay, GDK_WINDOW_XWINDOW(window->window));
--#else
--#error unimplemented GTK backend
- #endif
-
- }
diff --git a/patches/gst-plugins-gl-0.10.2/series b/patches/gst-plugins-gl-0.10.2/series
deleted file mode 100644
index e43a9ba..0000000
--- a/patches/gst-plugins-gl-0.10.2/series
+++ /dev/null
@@ -1 +0,0 @@
-disable-broken-example.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 28/28] gtk: clean up patches
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
` (25 preceding siblings ...)
2011-10-30 22:00 ` [ptxdist] [PATCH 27/28] gst-plugins-gl: " Robert Schwebel
@ 2011-10-30 22:00 ` Robert Schwebel
26 siblings, 0 replies; 29+ messages in thread
From: Robert Schwebel @ 2011-10-30 22:00 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
.../0001-gtk-2.10.11-iconcache.diff.patch | 33 ++++++++++++++++++++
.../0002-gtk-2.10.12-no-demos.diff.patch | 25 +++++++++++++++
patches/gtk+-2.18.7/gtk+-2.10.11-iconcache.diff | 25 ---------------
patches/gtk+-2.18.7/gtk+-2.10.12-no-demos.diff | 17 ----------
patches/gtk+-2.18.7/series | 2 -
5 files changed, 58 insertions(+), 44 deletions(-)
create mode 100644 patches/gtk+-2.18.7/0001-gtk-2.10.11-iconcache.diff.patch
create mode 100644 patches/gtk+-2.18.7/0002-gtk-2.10.12-no-demos.diff.patch
delete mode 100644 patches/gtk+-2.18.7/gtk+-2.10.11-iconcache.diff
delete mode 100644 patches/gtk+-2.18.7/gtk+-2.10.12-no-demos.diff
delete mode 100644 patches/gtk+-2.18.7/series
diff --git a/patches/gtk+-2.18.7/0001-gtk-2.10.11-iconcache.diff.patch b/patches/gtk+-2.18.7/0001-gtk-2.10.11-iconcache.diff.patch
new file mode 100644
index 0000000..2946f79
--- /dev/null
+++ b/patches/gtk+-2.18.7/0001-gtk-2.10.11-iconcache.diff.patch
@@ -0,0 +1,33 @@
+From 8fed496b71b501058bb0d27e547f858cee100f22 Mon Sep 17 00:00:00 2001
+From: unknown author <unknown.author@example.com>
+Date: Sun, 30 Oct 2011 22:38:42 +0100
+Subject: [PATCH 1/2] gtk+-2.10.11-iconcache.diff
+
+---
+ gtk/Makefile.am | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 267c499..2ce0bd4 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -1304,11 +1304,11 @@ gtk_update_icon_cache_program = \
+ ./gtk-update-icon-cache
+ endif
+
+-gtkbuiltincache.h: @REBUILD@ stamp-icons
+- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
+- $(gtk_update_icon_cache_program) --force --ignore-theme-index \
+- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
+- mv gtkbuiltincache.h.tmp gtkbuiltincache.h
++#gtkbuiltincache.h: @REBUILD@ stamp-icons
++# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
++# $(gtk_update_icon_cache_program) --force --ignore-theme-index \
++# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
++# mv gtkbuiltincache.h.tmp gtkbuiltincache.h
+
+ EXTRA_DIST += \
+ $(STOCK_ICONS) \
+--
+1.7.7
+
diff --git a/patches/gtk+-2.18.7/0002-gtk-2.10.12-no-demos.diff.patch b/patches/gtk+-2.18.7/0002-gtk-2.10.12-no-demos.diff.patch
new file mode 100644
index 0000000..800f999
--- /dev/null
+++ b/patches/gtk+-2.18.7/0002-gtk-2.10.12-no-demos.diff.patch
@@ -0,0 +1,25 @@
+From 6967f987acd29442bf34a3f527ae8dc47b933a9c Mon Sep 17 00:00:00 2001
+From: unknown author <unknown.author@example.com>
+Date: Sun, 30 Oct 2011 22:38:42 +0100
+Subject: [PATCH 2/2] gtk+-2.10.12-no-demos.diff
+
+---
+ Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 38f245b..1c06145 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ ## Makefile.am for GTK+
+ include $(top_srcdir)/Makefile.decl
+
+-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+
+ # require automake 1.4
+--
+1.7.7
+
diff --git a/patches/gtk+-2.18.7/gtk+-2.10.11-iconcache.diff b/patches/gtk+-2.18.7/gtk+-2.10.11-iconcache.diff
deleted file mode 100644
index 206977d..0000000
--- a/patches/gtk+-2.18.7/gtk+-2.10.11-iconcache.diff
+++ /dev/null
@@ -1,25 +0,0 @@
----
- gtk/Makefile.am | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-Index: b/gtk/Makefile.am
-===================================================================
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -1300,11 +1300,11 @@ gtk_update_icon_cache_program = \
- ./gtk-update-icon-cache
- endif
-
--gtkbuiltincache.h: @REBUILD@ stamp-icons
-- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
-- $(gtk_update_icon_cache_program) --force --ignore-theme-index \
-- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
-- mv gtkbuiltincache.h.tmp gtkbuiltincache.h
-+#gtkbuiltincache.h: @REBUILD@ stamp-icons
-+# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
-+# $(gtk_update_icon_cache_program) --force --ignore-theme-index \
-+# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
-+# mv gtkbuiltincache.h.tmp gtkbuiltincache.h
-
- EXTRA_DIST += \
- $(STOCK_ICONS) \
diff --git a/patches/gtk+-2.18.7/gtk+-2.10.12-no-demos.diff b/patches/gtk+-2.18.7/gtk+-2.10.12-no-demos.diff
deleted file mode 100644
index b8d131a..0000000
--- a/patches/gtk+-2.18.7/gtk+-2.10.12-no-demos.diff
+++ /dev/null
@@ -1,17 +0,0 @@
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: b/Makefile.am
-===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- ## Makefile.am for GTK+
- include $(top_srcdir)/Makefile.decl
-
--SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
-
- # require automake 1.4
diff --git a/patches/gtk+-2.18.7/series b/patches/gtk+-2.18.7/series
deleted file mode 100644
index 3067390..0000000
--- a/patches/gtk+-2.18.7/series
+++ /dev/null
@@ -1,2 +0,0 @@
-gtk+-2.10.11-iconcache.diff
-gtk+-2.10.12-no-demos.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
end of thread, other threads:[~2011-10-30 22:00 UTC | newest]
Thread overview: 29+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-30 22:00 [ptxdist] Patch cleanup Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 02/28] devicekit-disks: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 03/28] mplayer: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 04/28] policykit: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 05/28] sdl: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 06/28] sdl-mixer: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 07/28] atop: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 08/28] bing: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 09/28] bridge-utils: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 10/28] bzip2: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 11/28] cbmbasic: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 12/28] cpufrequtils: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 13/28] cvs: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 14/28] daemonize: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 15/28] dibbler: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 16/28] e2fsprogs: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 17/28] efax: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 18/28] eggdbus: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 19/28] elektra: remove orphaned package Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 20/28] etherwake: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 21/28] fakeroot: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 22/28] fbtest: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 23/28] font-alias: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 24/28] freetype: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 25/28] glademm: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 26/28] gpsd: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 27/28] gst-plugins-gl: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 28/28] gtk: " Robert Schwebel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox