rpm/libwnck
SHA256
1
0
Fork 0
forked from pool/libwnck
Code Pull Requests Activity

Accepting request 21929 from home:vuntz:branches:GNOME:Factory

Browse Source 
Copy from home:vuntz:branches:GNOME:Factory/libwnck via accept of submit request 21929 revision 4.
Request was accepted with message:
Forwarding to openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/21929
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libwnck?expand=0&rev=32
This commit is contained in:
Vincent Untz 2009-10-06 17:49:01 +00:00 committed by Git OBS Bridge
parent ccf079fd7e
commit 97361def5d
3 changed files with 60 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
libwnck-fix-bindings.patch Normal file
View File

@ -0,0 +1,51 @@
commit 51879e605ade65d1862f9a114e2a0a0c8defd5c0
Author: Arun Raghavan <ford_prefect@gentoo.org>
Date: Tue Oct 6 19:22:41 2009 +0200
[build] Fix generation of wnck-enum-types.c to not break bindings
We use g_flag_register_static() for flag types (rather than always
using g_enum_register_static()).
https://bugzilla.gnome.org/show_bug.cgi?id=590534
Index: libwnck-2.28.0/libwnck/Makefile.am
===================================================================
--- libwnck-2.28.0.orig/libwnck/Makefile.am
+++ libwnck-2.28.0/libwnck/Makefile.am
@@ -129,13 +129,13 @@ wnck-enum-types.c: $(wnck_headers) wnck-
$(AM_V_GEN)glib-mkenums \
--fhead "#include <libwnck/libwnck.h>\n" \
--fprod "\n/* enumerations from \"@filename@\" */" \
- --vhead "static const GEnumValue _@enum_name@_values[] = {" \
+ --vhead "static const G@Type@Value _@enum_name@_values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n};\n\n" \
--vtail "GType\n@enum_name@_get_type (void)\n{\n" \
--vtail " static GType type = 0;\n\n" \
--vtail " if (!type)\n" \
- --vtail " type = g_enum_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \
+ --vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \
--vtail " return type;\n}\n\n" \
$(wnck_headers) > $@
Index: libwnck-2.28.0/libwnck/Makefile.in
===================================================================
--- libwnck-2.28.0.orig/libwnck/Makefile.in
+++ libwnck-2.28.0/libwnck/Makefile.in
@@ -899,13 +899,13 @@ wnck-enum-types.c: $(wnck_headers) wnck-
$(AM_V_GEN)glib-mkenums \
--fhead "#include <libwnck/libwnck.h>\n" \
--fprod "\n/* enumerations from \"@filename@\" */" \
- --vhead "static const GEnumValue _@enum_name@_values[] = {" \
+ --vhead "static const G@Type@Value _@enum_name@_values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n};\n\n" \
--vtail "GType\n@enum_name@_get_type (void)\n{\n" \
--vtail " static GType type = 0;\n\n" \
--vtail " if (!type)\n" \
- --vtail " type = g_enum_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \
+ --vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \
--vtail " return type;\n}\n\n" \
$(wnck_headers) > $@

6
libwnck.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Oct 6 19:28:48 CEST 2009 - vuntz@opensuse.org
- Add libwnck-fix-bindings.patch to fix an issue that broke python
bindings for libwnck.
-------------------------------------------------------------------
Tue Sep 22 19:44:08 CEST 2009 - dimstar@opensuse.org

21
libwnck.spec
View File

@ -38,6 +38,8 @@ Release: 1
Summary: Window Navigator Construction Kit (Library Package)
Source: %{name}-%{version}.tar.bz2
Source1: %{name}_spec-update.sh
# PATCH-FIX-UPSTREAM libwnck-fix-bindings.patch vuntz@opensuse.org -- Taken from upstream
Patch0: libwnck-fix-bindings.patch
Requires: libwnck-1-22 = %{version} licenses
Requires: %{name}-lang = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -46,12 +48,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
The Window Navigator Construction Kit is a library that can be used to
write task lists, pagers, and similar GNOME programs.
Authors:
--------
Havoc Pennington <hp@redhat.com>
%package -n libwnck-1-22
License: LGPL v2.1 or later
Summary: Window Navigator Construction Kit (Library Package)
@ -68,12 +64,6 @@ Obsoletes: libwnck-64bit
The Window Navigator Construction Kit is a library that can be used to
write task lists, pagers, and similar GNOME programs.
Authors:
--------
Havoc Pennington <hp@redhat.com>
%package devel
License: GPL v2 or later
Summary: Include Files and Libraries mandatory for Development
@ -90,15 +80,10 @@ Provides: libwnck-doc = %{version}
This package contains all necessary include files and libraries needed
to develop applications that require these.
Authors:
--------
Havoc Pennington <hp@redhat.com>
%lang_package
%prep
%setup -q
%patch0 -p1
# rpmlint note: libwnck has a separate translation for both Bengali and Bengali India
%build