author | Michael Krelin <hacker@klever.net> | 2007-05-10 14:47:10 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-05-10 14:47:10 (UTC) |
commit | 5c17a28c08a60b93d1b9c1476ea4bac811f2d22d (patch) (unidiff) | |
tree | aaf905043faf6378533d265cab186aa35c5dffe8 | |
parent | 779b7be86f185d86633bf25759c31d12d1c1a157 (diff) | |
download | misc-5c17a28c08a60b93d1b9c1476ea4bac811f2d22d.zip misc-5c17a28c08a60b93d1b9c1476ea4bac811f2d22d.tar.gz misc-5c17a28c08a60b93d1b9c1476ea4bac811f2d22d.tar.bz2 |
app-pda/pilot-link: really fixed m4 patch
-rw-r--r-- | app-pda/pilot-link/Manifest | 8 | ||||
-rw-r--r-- | app-pda/pilot-link/files/pilot-link-0.12.2-build.patch | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest index c8dec5d..ced66d2 100644 --- a/app-pda/pilot-link/Manifest +++ b/app-pda/pilot-link/Manifest | |||
@@ -1,12 +1,12 @@ | |||
1 | AUX pilot-link-0.12.2-build.patch 2815 RMD160 a17d316435ed59aa65b0b31760b40f96d8580ef0 SHA1 057f58ce1c755e57ac849759babaca851c642fe0 SHA256 5b0d3bd0ec96c91ea9b654aea0001a6ec84419550bd208c0308395d547c7fdee | 1 | AUX pilot-link-0.12.2-build.patch 2821 RMD160 c5f78dd262b485451dad968419287c60ca1465ea SHA1 6fd48314bc6589cef730c12fb73a8ba4e7dc5529 SHA256 dfe29c60b2c5f2d34fecf01341eaf74ce1557e9840b644bee860267728fddeb8 |
2 | MD5 01cbe947bab232629362d3465f334584 files/pilot-link-0.12.2-build.patch 2815 | 2 | MD5 b32e5c0ef51ee3a6f0695ed617a50e05 files/pilot-link-0.12.2-build.patch 2821 |
3 | RMD160 a17d316435ed59aa65b0b31760b40f96d8580ef0 files/pilot-link-0.12.2-build.patch 2815 | 3 | RMD160 c5f78dd262b485451dad968419287c60ca1465ea files/pilot-link-0.12.2-build.patch 2821 |
4 | SHA256 5b0d3bd0ec96c91ea9b654aea0001a6ec84419550bd208c0308395d547c7fdee files/pilot-link-0.12.2-build.patch 2815 | 4 | SHA256 dfe29c60b2c5f2d34fecf01341eaf74ce1557e9840b644bee860267728fddeb8 files/pilot-link-0.12.2-build.patch 2821 |
5 | DIST pilot-link-0.12.2.tar.bz2 964014 RMD160 3ae19f16b28c33cccb19fa218cdad4353d479875 SHA1 29a2b355ad8b0680e655c7e1ffa1ebef1b2ad5d9 SHA256 809df99a97aae215f93c1a0863644c0d3411462a5bac2d16d4d8941ce9c6d150 | 5 | DIST pilot-link-0.12.2.tar.bz2 964014 RMD160 3ae19f16b28c33cccb19fa218cdad4353d479875 SHA1 29a2b355ad8b0680e655c7e1ffa1ebef1b2ad5d9 SHA256 809df99a97aae215f93c1a0863644c0d3411462a5bac2d16d4d8941ce9c6d150 |
6 | EBUILD pilot-link-0.12.2.ebuild 1690 RMD160 867a8d3d340594d7f918dcce2a064dcf0793d14a SHA1 40fb778e62606e88cb7681e69adcefdd8a9da5df SHA256 5c6ae2364a66e25f639affa5a35500cc47f23e13fc19ab3e1c439e6a4bf30f66 | 6 | EBUILD pilot-link-0.12.2.ebuild 1690 RMD160 867a8d3d340594d7f918dcce2a064dcf0793d14a SHA1 40fb778e62606e88cb7681e69adcefdd8a9da5df SHA256 5c6ae2364a66e25f639affa5a35500cc47f23e13fc19ab3e1c439e6a4bf30f66 |
7 | MD5 9210106d711d2db30de66772d2cd055c pilot-link-0.12.2.ebuild 1690 | 7 | MD5 9210106d711d2db30de66772d2cd055c pilot-link-0.12.2.ebuild 1690 |
8 | RMD160 867a8d3d340594d7f918dcce2a064dcf0793d14a pilot-link-0.12.2.ebuild 1690 | 8 | RMD160 867a8d3d340594d7f918dcce2a064dcf0793d14a pilot-link-0.12.2.ebuild 1690 |
9 | SHA256 5c6ae2364a66e25f639affa5a35500cc47f23e13fc19ab3e1c439e6a4bf30f66 pilot-link-0.12.2.ebuild 1690 | 9 | SHA256 5c6ae2364a66e25f639affa5a35500cc47f23e13fc19ab3e1c439e6a4bf30f66 pilot-link-0.12.2.ebuild 1690 |
10 | MD5 2d3563e047f94fe8adc2d327ff046b32 files/digest-pilot-link-0.12.2 256 | 10 | MD5 2d3563e047f94fe8adc2d327ff046b32 files/digest-pilot-link-0.12.2 256 |
11 | RMD160 1c7ca253534c3a18eba1c760b3bd71a143fafc23 files/digest-pilot-link-0.12.2 256 | 11 | RMD160 1c7ca253534c3a18eba1c760b3bd71a143fafc23 files/digest-pilot-link-0.12.2 256 |
12 | SHA256 8e247afc68e1f741adcff994523248987e858ee23c07b3887ae03cb62d095ace files/digest-pilot-link-0.12.2 256 | 12 | SHA256 8e247afc68e1f741adcff994523248987e858ee23c07b3887ae03cb62d095ace files/digest-pilot-link-0.12.2 256 |
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.2-build.patch b/app-pda/pilot-link/files/pilot-link-0.12.2-build.patch index d2961b5..e26ccb7 100644 --- a/app-pda/pilot-link/files/pilot-link-0.12.2-build.patch +++ b/app-pda/pilot-link/files/pilot-link-0.12.2-build.patch | |||
@@ -50,40 +50,40 @@ index 68a05f2..4da0626 100644 | |||
50 | AC_DEFINE(HAVE_PNG, 1, [Define if we have PNG support]) | 50 | AC_DEFINE(HAVE_PNG, 1, [Define if we have PNG support]) |
51 | have_png=yes | 51 | have_png=yes |
52 | + msg_png=yes | 52 | + msg_png=yes |
53 | fi | 53 | fi |
54 | fi | 54 | fi |
55 | fi | 55 | fi |
56 | @@ -351,12 +353,13 @@ PKG_CHECK_MODULES(BLUEZ, bluez, have_bluez=yes, AC_MSG_RESULT(no)) | 56 | @@ -351,12 +353,13 @@ PKG_CHECK_MODULES(BLUEZ, bluez, have_bluez=yes, AC_MSG_RESULT(no)) |
57 | AC_MSG_CHECKING([for BlueZ bluetooth support]) | 57 | AC_MSG_CHECKING([for BlueZ bluetooth support]) |
58 | AC_ARG_WITH(bluez, | 58 | AC_ARG_WITH(bluez, |
59 | AC_HELP_STRING([--with-bluez], | 59 | AC_HELP_STRING([--with-bluez], |
60 | - [Enable usage of BlueZ]),, | 60 | - [Enable usage of BlueZ]),, |
61 | + [Enable usage of BlueZ]),[use_bluez="$withval"], | 61 | + [Enable usage of BlueZ]),[use_bluez="$withval"], |
62 | use_bluez=auto) | 62 | use_bluez=auto) |
63 | if test "x$use_bluez" != "xno"; then | 63 | if test "x$use_bluez" != "xno"; then |
64 | if test "x$have_bluez" = xno && test "x$use_bluez" = xyes; then | 64 | if test "x$have_bluez" = xno && test "x$use_bluez" = xyes; then |
65 | AC_MSG_ERROR([BlueZ explicitly requested but no support found]) | 65 | AC_MSG_ERROR([BlueZ explicitly requested but no support found]) |
66 | fi | 66 | fi |
67 | +use_bluez="$have_bluez" | 67 | +use_bluez="$have_bluez" |
68 | if test "x$have_bluez" = xyes; then | 68 | if test "x$have_bluez" = xyes; then |
69 | AC_DEFINE(HAVE_BLUEZ, 1, [Define if we have BlueZ bluetooth support]) | 69 | AC_DEFINE(HAVE_BLUEZ, 1, [Define if we have BlueZ bluetooth support]) |
70 | AC_MSG_RESULT([enabled]) | 70 | AC_MSG_RESULT([enabled]) |
71 | @@ -366,7 +369,7 @@ if test "x$use_bluez" != "xno"; then | 71 | @@ -366,7 +369,7 @@ if test "x$use_bluez" != "xno"; then |
72 | fi | 72 | fi |
73 | fi | 73 | fi |
74 | 74 | ||
75 | -AM_CONDITIONAL(WITH_BLUEZ, test x$have_bluez = "xyes") | 75 | -AM_CONDITIONAL(WITH_BLUEZ, test x$have_bluez = "xyes") |
76 | +AM_CONDITIONAL(WITH_BLUEZ, test x$use_bluez != "xno") | 76 | +AM_CONDITIONAL(WITH_BLUEZ, test x$use_bluez != "xno") |
77 | 77 | ||
78 | 78 | ||
79 | dnl ********************************* | 79 | dnl ********************************* |
80 | diff --git a/pilot-link.m4.in b/pilot-link.m4.in | 80 | diff --git a/pilot-link.m4.in b/pilot-link.m4.in |
81 | index 129dfc3..a271c74 100644 | 81 | index 129dfc3..a271c74 100644 |
82 | --- a/pilot-link.m4 | 82 | --- a/pilot-link.m4.in |
83 | +++ b/pilot-link.m4 | 83 | +++ b/pilot-link.m4.in |
84 | @@ -1,5 +1,3 @@ | 84 | @@ -1,5 +1,3 @@ |
85 | -AC_DEFUN([IT_PROG_INTLTOOL], [AC_PREREQ([2.50])dnl | 85 | -AC_DEFUN([IT_PROG_INTLTOOL], [AC_PREREQ([2.50])dnl |
86 | - | 86 | - |
87 | AC_DEFUN([AC_PILOT_LINK_HOOK], | 87 | AC_DEFUN([AC_PILOT_LINK_HOOK], |
88 | [ | 88 | [ |
89 | PILOT_LINK_VERS=0 | 89 | PILOT_LINK_VERS=0 |