Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.14 grimoire by Eric Sandall (746390ebd7079a56fcb3d157105b64d96c019401)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.14 grimoire by Eric Sandall (746390ebd7079a56fcb3d157105b64d96c019401)
  • Date: Sat, 20 Oct 2007 21:11:00 -0500

GIT changes to stable-0.14 grimoire by Eric Sandall <sandalle AT sourcemage.org>:

libs/locale/DETAILS | 1
libs/locale/HISTORY | 4 +
libs/locale/locales | 10 ++--
utils/hal/BUILD | 8 ---
utils/hal/CONFIGURE | 12 ----
utils/hal/DEPENDS | 6 --
utils/hal/DETAILS | 4 -
utils/hal/HISTORY | 20 --------
utils/hal/PRE_BUILD | 6 +-
utils/hal/hal-0.5.8.1-hal-device-dbus-close.patch | 11 ++++
utils/hal/hal-0.5.8.1-lshal-dbus-close.patch | 11 ++++
utils/hal/libparted_check.patch | 54
+++++++++++-----------
12 files changed, 67 insertions(+), 80 deletions(-)

New commits:
commit 746390ebd7079a56fcb3d157105b64d96c019401
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "hal-0.5.9.1"

This reverts commit de25ecfc506f9016c8d739886d36e43344bdaba2.

Fix Bug #14040 Part 2/2

commit 5f37c3aa031673d3bc463cc7926115b679a8a41c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "hal - add back selinux stuff"

This reverts commit 00c41ae4ef70debf7b09faab5d59f65dca9c6129.

Fix Bug #14040 Part 1/2

commit 4e10ee43a64d4f48ff31526f93b510e204546222
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Eric Sandall <sandalle AT sourcemage.org>

locale - fixed character maps [Bug 14044]

diff --git a/libs/locale/DETAILS b/libs/locale/DETAILS
index 3c335c8..a1a913c 100755
--- a/libs/locale/DETAILS
+++ b/libs/locale/DETAILS
@@ -1,5 +1,6 @@
SPELL=locale
VERSION=0.0.2
+ PATCHLEVEL=1
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.gnu.org/software/libc
LICENSE[0]=LGPL
diff --git a/libs/locale/HISTORY b/libs/locale/HISTORY
index a2a7208..9ef6c29 100644
--- a/libs/locale/HISTORY
+++ b/libs/locale/HISTORY
@@ -1,3 +1,7 @@
+2007-10-20 Ladislav Hagara <hgr AT vabo.cz>
+ * locales: fixed character maps [Bug 14044]
+ * DETAILS: PATCHLEVEL=1
+
2007-04-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* CONFIGURE: clarified the explanation a bit more

diff --git a/libs/locale/locales b/libs/locale/locales
index aaa4c8a..4e2f757 100755
--- a/libs/locale/locales
+++ b/libs/locale/locales
@@ -31,7 +31,7 @@ bs_BA/ISO-8859-2
Bosnian_locale_for_Bosnia_and_Herzegowina off
byn_ER/UTF-8 Blin_locale_for_Eritrea
off
ca_ES/ISO-8859-1 Catalan_locale_for_Catalonia
off
ca_ES@euro/ISO-8859-15 Catalan_locale_for_Catalonia_with_Euro
off
-cs_CZ/ISO_8859-2 Czech_locale_for_the_Czech_Republic
off
+cs_CZ/ISO-8859-2 Czech_locale_for_the_Czech_Republic
off
cy_GB/ISO-8859-14 Welsh_locale_for_Great_Britain
off
da_DK/ISO-8859-1 Danish_locale_for_Denmark
off
de_AT/ISO-8859-1 German_locale_for_Austria
off
@@ -48,7 +48,7 @@ el_GR@euro/UTF-8
Greek_locale_for_Greece_with_Euro off
en_AU/ISO-8859-1 English_locale_for_Australia
off
en_BW/ISO-8859-1 English_locale_for_Botswana
off
en_CA/ISO-8859-1 English_locale_for_Canada
off
-en_DK/ISO_8859-1 English_locale_for_Denmark
off
+en_DK/ISO-8859-1 English_locale_for_Denmark
off
en_GB/ISO-8859-1 English_locale_for_Britain
off
en_HK/ISO-8859-1 English_locale_for_Hong_Kong
off
en_IE/ISO-8859-1 English_locale_for_Ireland
off
@@ -98,7 +98,7 @@ fr_LU/ISO-8859-1 French_locale_for_Luxemburg
off
fr_LU@euro/ISO-8859-15 French_locale_for_Luxemburg_with_Euro
off
ga_IE/ISO-8859-1 Irish_locale_for_Ireland
off
ga_IE@euro/ISO-8859-15 Irish_locale_for_Ireland_with_Euro
off
-gd_GB/ISO_8859-15 Scots_Gaelic_locale_for_Great_Britain
off
+gd_GB/ISO-8859-15 Scots_Gaelic_locale_for_Great_Britain
off
gez_ER/UTF-8 Ge'ez_locale_for_Eritrea
off
gez_ER@abegede/UTF-8 Ge'ez_locale_for_Eritrea_With_Abegede_Collation
off
gez_ET/UTF-8 Ge'ez_locale_for_Ethiopia
off
@@ -141,7 +141,7 @@ nl_BE@euro/ISO-8859-15
Dutch_locale_for_Belgium_with_Euro off
nl_NL/ISO-8859-1 Dutch_locale_for_the_Netherlands
off
nl_NL@euro/ISO-8859-15 Dutch_locale_for_the_Netherlands_with_Euro
off
nn_NO/ISO-8859-1 Nynorsk_locale_for_Norway
off
-oc_FR/ISO_8859-1 Occitan_Locale_for_France
off
+oc_FR/ISO-8859-1 Occitan_Locale_for_France
off
om_ET/UTF-8 Oromo_locale_for_Ethiopia
off
om_KE/ISO-8859-1 Oromo_locale_for_Kenya
off
pa_IN/UTF-8 Punjabi_locale_for_India
off
@@ -182,7 +182,7 @@ ur_PK/CP1256 Urdu_Locale_for_Pakistan
off
uz_UZ/UTF-8 Uzbek_(latin)_locale_for_Uzbekistan
off
uz_UZ@cyrillic/UTF-8 Uzbek_(cyrillic)_locale_for_Uzbekistan
off
vi_VN/UTF-8 Vietnamese_locale_for_Vietnam
off
-wa_BE/ISO_8859-1 Walloon_Locale_for_Belgium
off
+wa_BE/ISO-8859-1 Walloon_Locale_for_Belgium
off
wa_BE@euro/ISO-8859-15 Walloon_locale_for_Belgium_with_Euro
off
xh_ZA/UTF-8 Xhosa_locale_for_South_Africa
off
yi_US/CP1255 Yiddish_locale
off
diff --git a/utils/hal/BUILD b/utils/hal/BUILD
index 26dcdb3..cc073b0 100755
--- a/utils/hal/BUILD
+++ b/utils/hal/BUILD
@@ -3,9 +3,5 @@ if [ "$SELINUX" == "y" ]; then
OPTS="$OPTS --enable-selinux"
fi &&
OPTS="$OPTS --with-pid-file=/var/run/hald.pid \
- --with-backend=linux \
- $HALACPI $HALAPM $HALSONY $HALPMU" &&
-default_build
-# --enable-sysfs-carrier --enable-hotplug-map \
-# --disable-policy-kit" &&
-#PKG_CONFIG="/usr/bin/pkg-config" default_build
+ --enable-sysfs-carrier --enable-hotplug-map --disable-policy-kit"
&&
+PKG_CONFIG="/usr/bin/pkg-config" default_build
diff --git a/utils/hal/CONFIGURE b/utils/hal/CONFIGURE
index fd304ba..b9fa0b0 100755
--- a/utils/hal/CONFIGURE
+++ b/utils/hal/CONFIGURE
@@ -1,13 +1 @@
config_query SELINUX "Enable SELinux support?" n
-config_query_option HALSONY "Sony PIC support?" n \
- "--enable-sonypic" \
- "--disable-sonypic"
-config_query_option HALACPI "ACPI support?" n \
- "--enable-acpi" \
- "--disable-acpi"
-config_query_option HALAPM "APM support?" n \
- "--enable-apm" \
- "--disable-apm"
-config_query_option HALPMU "PMU support?" n \
- "--enable-pmu" \
- "--disable-pmu"
diff --git a/utils/hal/DEPENDS b/utils/hal/DEPENDS
index 7b55f5d..59cb7c0 100755
--- a/utils/hal/DEPENDS
+++ b/utils/hal/DEPENDS
@@ -8,17 +8,11 @@ depends python &&
depends udev &&
depends xml-parser-expat &&
depends pkgconfig &&
-depends hal-info &&
depends dbus-python &&

# bug #13500
sub_depends udev VOLUME_ID &&

-#optional_depends consolekit \
-# "--enable-console-kit" \
-# "--disable-console-kit" \
-# "ConsoleKit support" &&
-
#optional_depends polkit \
# "--enable-policy-kit" \
# "--disable-policy-kit" \
diff --git a/utils/hal/DETAILS b/utils/hal/DETAILS
index d1f61a9..2fd31a2 100755
--- a/utils/hal/DETAILS
+++ b/utils/hal/DETAILS
@@ -1,6 +1,6 @@
SPELL=hal
- VERSION=0.5.9.1
-
SOURCE_HASH=sha512:0705eb15a406090829b4339cc0714acda8ebb11cf840e8c20d7e9a3ff7cca9ed48c55d323b3b14599becf87b079ed3e694cc1b46f1e87ec7237648bc4d456cda
+ VERSION=0.5.8.1
+
SOURCE_HASH=sha512:044677b047517cd641f6b2e9f36cef7dd05ee035b636cd8c1d4900e300aa3b0ab5d979bd87e1bb7c4ba1689dd6546c91cca74400107a14b9a2d5f63278fd01c6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://freedesktop.org/~david/dist/$SOURCE
diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index a4cf5bd..f224ff3 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,23 +1,3 @@
-2007-09-24 Treeve Jelbert <treeve AT sourcemage.org>
- * BUILD, CONFIGURE: uncomment selinx stuff
-
-2007-08-14 Treeve Jelbert <treeve AT sourcemage.org>
- * libparted_check.patch: updated for parted-1.8.8
-
-2007-06-20 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.5.9.1
- * hal-0.5.8.1*.patch: deleted
- * PRE_BUILD: don't apply redundant patches
- remove macbook stuff
- * DEPENDS: add optional consolekit
- * CONFIGURE, BUILD:
- remove obsolete options, add Sony, acpi, apm
-
-2007-05-24 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.5.9
- * libparted_check.patch: updated
- * DEPENDS: add hal-info
-
2007-05-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, hal-0.5.8.1-hal-device-dbus-close.patch: added another
patch to prevent incorrect use of the dbus API
diff --git a/utils/hal/PRE_BUILD b/utils/hal/PRE_BUILD
index 7684fc0..a17aa0a 100755
--- a/utils/hal/PRE_BUILD
+++ b/utils/hal/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SCRIPT_DIRECTORY}/libparted_check.patch
-#sed -i 's/use_macbookpro/with_macbookpro/' configure
+patch -p0 < ${SCRIPT_DIRECTORY}/libparted_check.patch &&
+patch -p1 < ${SCRIPT_DIRECTORY}/hal-0.5.8.1-lshal-dbus-close.patch &&
+patch -p1 < ${SCRIPT_DIRECTORY}/hal-0.5.8.1-hal-device-dbus-close.patch &&
+sed -i 's/use_macbookpro/with_macbookpro/' configure
diff --git a/utils/hal/hal-0.5.8.1-hal-device-dbus-close.patch
b/utils/hal/hal-0.5.8.1-hal-device-dbus-close.patch
new file mode 100644
index 0000000..57b4bea
--- /dev/null
+++ b/utils/hal/hal-0.5.8.1-hal-device-dbus-close.patch
@@ -0,0 +1,11 @@
+diff -Naupr hal-0.5.8.1.orig/tools/hal-device.c
hal-0.5.8.1/tools/hal-device.c
+--- hal-0.5.8.1.orig/tools/hal-device.c 2007-05-09 16:18:19.000000000
+0200
++++ hal-0.5.8.1/tools/hal-device.c 2007-05-09 16:40:06.000000000 +0200
+@@ -157,7 +157,6 @@ int main(int argc, char **argv)
+
+ libhal_ctx_shutdown(hal_ctx, &error);
+ libhal_ctx_free(hal_ctx);
+- dbus_connection_close(conn);
+ dbus_connection_unref(conn);
+ dbus_error_free(&error);
+
diff --git a/utils/hal/hal-0.5.8.1-lshal-dbus-close.patch
b/utils/hal/hal-0.5.8.1-lshal-dbus-close.patch
new file mode 100644
index 0000000..5c46b6f
--- /dev/null
+++ b/utils/hal/hal-0.5.8.1-lshal-dbus-close.patch
@@ -0,0 +1,11 @@
+diff -Naupr hal-0.5.8.1.orig/tools/lshal.c hal-0.5.8.1/tools/lshal.c
+--- hal-0.5.8.1.orig/tools/lshal.c 2007-05-09 16:18:19.000000000 +0200
++++ hal-0.5.8.1/tools/lshal.c 2007-05-09 16:20:44.000000000 +0200
+@@ -722,7 +722,6 @@ main (int argc, char *argv[])
+ LIBHAL_FREE_DBUS_ERROR (&error);
+ libhal_ctx_free (hal_ctx);
+
+- dbus_connection_close (conn);
+ dbus_connection_unref (conn);
+
+ if (show_device)
diff --git a/utils/hal/libparted_check.patch b/utils/hal/libparted_check.patch
index d7d8131..b75c1e5 100644
--- a/utils/hal/libparted_check.patch
+++ b/utils/hal/libparted_check.patch
@@ -1,35 +1,35 @@
-diff -uNr hal-0.5.9.1/configure hal-0.5.9.1.cp/configure
---- hal-0.5.9.1/configure 2007-06-12 20:27:26.000000000 +0200
-+++ hal-0.5.9.1.cp/configure 2007-06-21 10:04:22.000000000 +0200
-@@ -22743,8 +22743,8 @@
+--- configure.old 2006-09-19 22:24:41.000000000 +0200
++++ configure 2006-12-02 10:34:32.000000000 +0100
+@@ -21658,9 +21658,9 @@
+ echo "$as_me: error: *** dl library (libdl) not found" >&2;}
{ (exit 1); exit 1; }; }
fi
-
-- { echo "$as_me:$LINENO: checking for libparted == 1.7.1, 1.8.0, 1.8.1,
1.8.2, 1.8.6" >&5
--echo $ECHO_N "checking for libparted == 1.7.1, 1.8.0, 1.8.1, 1.8.2,
1.8.6... $ECHO_C" >&6; }
-+ { echo "$as_me:$LINENO: checking for libparted == 1.7.1, 1.8.0, 1.8.1,
1.8.2, 1.8.6, 1.8.7" >&5
-+echo $ECHO_N "checking for libparted == 1.7.1, 1.8.0, 1.8.1, 1.8.2, 1.8.6,
1.8.8... $ECHO_C" >&6; }
+-
+- echo "$as_me:$LINENO: checking for libparted == 1.7.1" >&5
+-echo $ECHO_N "checking for libparted == 1.7.1... $ECHO_C" >&6
++save_LDFLAGS="$LDFLAGS"
++ echo "$as_me:$LINENO: checking for libparted >= 1.7.1" >&5
++echo $ECHO_N "checking for libparted >= 1.7.1... $ECHO_C" >&6
LDFLAGS=-lparted
if test "$cross_compiling" = yes; then
{ { echo "$as_me:$LINENO: error: cannot run test program while cross
compiling
-@@ -22774,7 +22774,8 @@
- (major == 1 && minor == 8 && micro == 0) ||
- (major == 1 && minor == 8 && micro == 1) ||
- (major == 1 && minor == 8 && micro == 2) ||
-- (major == 1 && minor == 8 && micro == 6))
-+ (major == 1 && minor == 8 && micro == 6) ||
-+ (major == 1 && minor == 8 && micro == 8))
- return 0;
+@@ -21686,7 +21686,9 @@
+ if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, &micro )
== 3 )
+ printf( "Found libparted %s", ped_get_version() ) ;

- return 1;
-@@ -22809,8 +22810,8 @@
- sed 's/^/| /' conftest.$ac_ext >&5
+- return ! ( major == 1 && minor == 7 && micro == 1 ) ;
++ return ! ((major > 1) ||
++ ((major == 1) && (minor > 7)) ||
++ ((major == 1) && (minor == 7) && (micro >= 1))) ;
+ }

- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: *** Requires libparted ==
1.7.1/1.8.0/1.8.1/1.8.2 or 1.8.6" >&5
--echo "$as_me: error: *** Requires libparted == 1.7.1/1.8.0/1.8.1/1.8.2 or
1.8.6" >&2;}
-+{ { echo "$as_me:$LINENO: error: *** Requires libparted ==
1.7.1/1.8.0/1.8.1/1.8.2 or 1.8.6/7" >&5
-+echo "$as_me: error: *** Requires libparted == 1.7.1/1.8.0/1.8.1/1.8.2 or
1.8.6/7/8" >&2;}
- { (exit 1); exit 1; }; }
+ _ACEOF
+@@ -21717,7 +21719,7 @@
+ fi
+ PARTED_LIBS=-lparted
+
+- LDFLAGS=
++ LDFLAGS="$save_LDFLAGS"
+ else
+ USE_PARTED=no
fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext
conftest.$ac_objext conftest.$ac_ext




Archive powered by MHonArc 2.6.24.

Top of Page