Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=8a4b915a878b4c4bfd04d705f856396d769a429a
commit 8a4b915a878b4c4bfd04d705f856396d769a429a
Author: Michel Hermier <herm...@frugalware.org>
Date: Sun May 12 17:21:17 2013 +0200
libflib: Rename f_list_remove to f_list_remove_find_custom, to free the symbol
for future use.
diff --git a/TODO b/TODO
index b184184..edd9c0b 100644
--- a/TODO
+++ b/TODO
@@ -56,4 +56,9 @@ libpacman and codechanges
into the sources.
-Christian Hamar alias krix <kr...@linuxforum.hu>
+Christian Hamar alias krix <kr...@linuxforum.hu>
+
+makepkg/pacman-g2:
+Define a TRIGER list.
+Define a PARENTPKG information attribute (to inform about subpackages).
+Bump so version.
diff --git a/configure.ac b/configure.ac
index 79f31d3..a927425 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,15 @@
ENV_CFLAGS=$CFLAGS
+dnl Define here the libpacman version number
+m4_define([pm_major_version], [3])
+m4_define([pm_minor_version], [9])
+m4_define([pm_micro_version], [0])
+m4_define([pm_extra_version], [])
+m4_define([pm_version],
[pm_major_version.pm_minor_version.pm_micro_versionpm_microversion])
+
AC_PREREQ(2.59)
dnl Update it right before the release since $pkgver_foo are all _post_ release
snapshots
-AC_INIT([pacman-g2 package manager], 3.9.0, [frugalware-de...@frugalware.org],
pacman-g2)
+AC_INIT([pacman-g2 package manager], m4_esyscmd([echo pm_version | tr -d
'\n']), [frugalware-de...@frugalware.org], pacman-g2)
AC_CONFIG_MACRO_DIR([m4])
AC_LANG(C)
AC_CONFIG_HEADERS(config.h)
@@ -18,11 +25,10 @@ case "${host}" in
esac
dnl Define here the libpacman version number
-PM_MAJOR_VERSION=0
-PM_MINOR_VERSION=3
-PM_MICRO_VERSION=8
-PM_MICRO_VERSION_SUFFIX=.9
-PM_VERSION=$PM_MAJOR_VERSION.$PM_MINOR_VERSION.$PM_MICRO_VERSION$PM_MICRO_VERSION_SUFFIX
+PM_MAJOR_VERSION=pm_major_version
+PM_MINOR_VERSION=pm_minor_version
+PM_MICRO_VERSION=pm_micro_version
+PM_VERSION=pm_version
dnl Needed for libtool to create proper shared lib version
PM_VERSION_INFO=`expr $PM_MAJOR_VERSION +
$PM_MINOR_VERSION`:$PM_MICRO_VERSION:$PM_MINOR_VERSION
diff --git a/lib/libflib/flist.c b/lib/libflib/flist.c
index 9fca22c..7d7c263 100644
--- a/lib/libflib/flist.c
+++ b/lib/libflib/flist.c
@@ -314,7 +314,7 @@ FList *f_list_add_sorted (FList *list, void *data,
FCompareFunc fn, void *user_d
* Otherwise, it is set to NULL.
* Return the new list (without the removed element).
*/
-FList *f_list_remove (FList *haystack, void *needle, FCompareFunc fn, void
**data) {
+FList *f_list_remove_find_custom (FList *haystack, void *needle, FCompareFunc
fn, void **data) {
FList *i = haystack;
if(data) {
diff --git a/lib/libflib/flist.h b/lib/libflib/flist.h
index 89c49fb..1be0336 100644
--- a/lib/libflib/flist.h
+++ b/lib/libflib/flist.h
@@ -80,7 +80,7 @@ void f_list_reverse_foreach (FList *list, FVisitorFunc fn,
void *user_data);
FList *f_list_uniques (FList *list, FCompareFunc fn, void *user_data);
FList *f_list_add_sorted (FList *list, void *data, FCompareFunc fn, void
*user_data);
-FList *f_list_remove (FList *haystack, void *needle, FCompareFunc fn, void
**data);
+FList *f_list_remove_find_custom (FList *haystack, void *needle, FCompareFunc
fn, void **data);
#endif /* F_LIST_H */
diff --git a/lib/libpacman/list.h b/lib/libpacman/list.h
index ee99722..5d85d1c 100644
--- a/lib/libpacman/list.h
+++ b/lib/libpacman/list.h
@@ -30,7 +30,7 @@ typedef FList pmlist_t;
#define FREELISTPTR(p) _FREELIST(p, NULL)
#define _pacman_list_add f_list_append
-#define _pacman_list_remove(list, ptr, fn, data) f_list_remove((list), (ptr),
(FCompareFunc)(fn), (data))
+#define _pacman_list_remove(list, ptr, fn, data)
f_list_remove_find_custom((list), (ptr), (FCompareFunc)(fn), (data))
#endif /* _PACMAN_LIST_H */
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
