diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-07 17:33:04 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-07 17:33:04 -0300 |
| commit | 2302f1d28510fadb2dcfa119f28ed28f164845bf (patch) | |
| tree | e7040e1c743f46bc60a7844275516e4404f6ac30 /testing/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch | |
| parent | 2a9d1292ab60e8a2356fb3eeb36b8c3cfc22759b (diff) | |
| parent | 5442e9b8f357932ed5d6cb46e90fcbf6f453469f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/fotoxx/PKGBUILD
community/gtkdialog/PKGBUILD
community/hubbub/PKGBUILD
community/libgdamm/PKGBUILD
community/libparserutils/PKGBUILD
community/mingw32-binutils/PKGBUILD
community/mingw32-gcc-base/PKGBUILD
community/mingw32-gcc/PKGBUILD
community/mtpaint/PKGBUILD
community/netsurf/PKGBUILD
community/patchage/PKGBUILD
community/qgo/PKGBUILD
community/tomoyo-tools/PKGBUILD
community/tre/PKGBUILD
community/virtualbox/PKGBUILD
core/net-tools/PKGBUILD
core/openldap/PKGBUILD
extra/epiphany/PKGBUILD
extra/evince/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/evolution/PKGBUILD
extra/exiv2/PKGBUILD
extra/folks/PKGBUILD
extra/gimp-ufraw/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-power-manager/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/gnome-python-extras/PKGBUILD
extra/gvfs/PKGBUILD
extra/jack/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdepim/PKGBUILD
extra/koffice/PKGBUILD
extra/libreoffice/PKGBUILD
extra/libwebkit/PKGBUILD
extra/mutter/PKGBUILD
extra/nautilus/PKGBUILD
extra/openmpi/PKGBUILD
extra/pavucontrol/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/postgresql/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pygobject2/PKGBUILD
extra/swt/PKGBUILD
extra/tomcat/PKGBUILD
extra/totem/PKGBUILD
extra/vigra/PKGBUILD
extra/vte/PKGBUILD
extra/xulrunner/PKGBUILD
kde-unstable/calligra/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
multilib/lib32-atk/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-glew/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-jack/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/lib32-pango/PKGBUILD
multilib/wine/PKGBUILD
social/miniupnpc/PKGBUILD
testing/icedtea-web-java7/PKGBUILD
testing/sqlite3/PKGBUILD
~xihh/abiword/PKGBUILD
Diffstat (limited to 'testing/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch')
| -rw-r--r-- | testing/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/testing/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch b/testing/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch new file mode 100644 index 000000000..5352688a2 --- /dev/null +++ b/testing/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch @@ -0,0 +1,40 @@ +From 715c6ddf3de90936c9ba7a6bb6904b7072d3b241 Mon Sep 17 00:00:00 2001 +From: Ionut Biru <ibiru@archlinux.org> +Date: Fri, 30 Sep 2011 10:57:14 +0000 +Subject: [PATCH] Avoid use of deprecated G_CONST_RETURN + +Signed-off-by: Ionut Biru <ibiru@archlinux.org> +--- + libepc/enums.c.in | 2 +- + libepc/enums.h.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libepc/enums.c.in b/libepc/enums.c.in +index 75f737c..bc81b84 100644 +--- a/libepc/enums.c.in ++++ b/libepc/enums.c.in +@@ -65,7 +65,7 @@ G@Type@Class* + * + * Returns: The string representation of @value, or %NULL. + */ +-G_CONST_RETURN gchar* ++const gchar* + @enum_name@_to_string (@EnumName@ value) + { + const G@Type@Value *@type@_value = g_@type@_get_value (@enum_name@_get_class (), value); +diff --git a/libepc/enums.h.in b/libepc/enums.h.in +index fea8b07..48973e5 100644 +--- a/libepc/enums.h.in ++++ b/libepc/enums.h.in +@@ -19,7 +19,7 @@ G_BEGIN_DECLS + + GType @enum_name@_get_type (void) G_GNUC_CONST; + G@Type@Class* @enum_name@_get_class (void) G_GNUC_CONST; +-G_CONST_RETURN gchar* @enum_name@_to_string (@EnumName@ value) G_GNUC_PURE; ++const gchar* @enum_name@_to_string (@EnumName@ value) G_GNUC_PURE; + /*** END value-header ***/ + + /*** BEGIN file-tail ***/ +-- +1.7.6.4 + |