rpms/mingw32-libglade2/F-11 libglade-2.0.1-nowarning.patch, NONE, 1.1 libglade-secondary.patch, NONE, 1.1 mingw32-libglade2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Thomas M. Sailer
sailer at fedoraproject.org
Fri Apr 17 19:35:10 UTC 2009
Author: sailer
Update of /cvs/extras/rpms/mingw32-libglade2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16430
Modified Files:
.cvsignore sources
Added Files:
libglade-2.0.1-nowarning.patch libglade-secondary.patch
mingw32-libglade2.spec
Log Message:
copy from devel
libglade-2.0.1-nowarning.patch:
--- NEW FILE libglade-2.0.1-nowarning.patch ---
--- libglade-2.0.1/glade/glade-gtk.c.nowarning 2003-08-29 14:50:10.000000000 -0400
+++ libglade-2.0.1/glade/glade-gtk.c 2003-08-29 14:58:41.000000000 -0400
@@ -639,9 +639,8 @@
if (!strcmp (childinfo->properties[j].name, "label")) {
label = childinfo->properties[j].value;
break;
- } else {
- g_warning ("Unknown CList child property: %s", childinfo->properties[j].name);
}
+ /* Ignore all other properties */
}
if (label) {
@@ -683,6 +682,7 @@
char *icon = NULL;
gboolean use_stock = FALSE, active = FALSE, new_group = FALSE;
gboolean use_underline = FALSE;
+ gboolean sensitive = TRUE;
GtkWidget *iconw = NULL;
int j;
@@ -708,6 +708,8 @@
group_name = value;
} else if (!strcmp (name, "new_group")) {
new_group = BOOL (value);
+ } else if (!strcmp (name, "sensitive")) {
+ sensitive = BOOL (value);
} else if (!strcmp (name, "visible")) {
/* ignore for now */
} else if (!strcmp (name, "tooltip")) {
@@ -785,6 +787,8 @@
gtk_label_set_use_underline (GTK_LABEL (toolbar_child->label),
TRUE);
}
+
+ gtk_widget_set_sensitive (child, sensitive);
glade_xml_set_common_params (xml, child, childinfo->child);
} else {
libglade-secondary.patch:
--- NEW FILE libglade-secondary.patch ---
diff -up libglade-2.6.3/glade/glade-gtk.c.secondary libglade-2.6.3/glade/glade-gtk.c
--- libglade-2.6.3/glade/glade-gtk.c.secondary 2009-02-20 00:21:52.433916022 -0500
+++ libglade-2.6.3/glade/glade-gtk.c 2009-02-20 00:22:02.065954023 -0500
@@ -544,7 +544,7 @@ gtk_dialog_build_children(GladeXML *self
{
GtkDialog *dialog = GTK_DIALOG (w);
- GList *children, *list;
+ GList *children, *list, *secondary;
glade_standard_build_children (self, w, info);
@@ -553,10 +553,13 @@ gtk_dialog_build_children(GladeXML *self
/* repack children of action_area */
children = gtk_container_get_children(GTK_CONTAINER(dialog->action_area));
+ secondary = NULL;
for (list = children; list; list = list->next) {
GtkWidget *child = GTK_WIDGET(list->data);
g_object_ref(child);
+ if (gtk_button_box_get_child_secondary (GTK_BUTTON_BOX (dialog->action_area), child))
+ secondary = g_list_prepend (secondary, child);
gtk_container_remove (GTK_CONTAINER (dialog->action_area), child);
}
for (list = children; list; list = list->next) {
@@ -569,7 +572,12 @@ gtk_dialog_build_children(GladeXML *self
g_object_unref(child);
}
+ for (list = secondary; list; list = list->next) {
+ GtkWidget *child = GTK_WIDGET(list->data);
+ gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (dialog->action_area), child, TRUE);
+ }
g_list_free (children);
+ g_list_free (secondary);
}
--- NEW FILE mingw32-libglade2.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}
Name: mingw32-libglade2
Version: 2.6.4
Release: 2%{?dist}
Summary: MinGW Windows Libglade2 library
License: LGPLv2+
Group: Development/Libraries
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/libglade/2.6/libglade-%{version}.tar.bz2
# http://bugzilla.gnome.org/show_bug.cgi?id=121025
Patch1: libglade-2.0.1-nowarning.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=510736
Patch2: libglade-secondary.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: mingw32-filesystem >= 23
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
BuildRequires: mingw32-gtk2
BuildRequires: mingw32-fontconfig
BuildRequires: mingw32-pango
BuildRequires: mingw32-gettext
BuildRequires: mingw32-libxml2
# Native one for msgfmt
BuildRequires: gettext
Requires: pkgconfig
%description
MinGW Windows Libglade2 library.
%package static
Summary: Static MinGW Windows Libglade2 library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description static
Static MinGW Windows Libglade2 library.
%prep
%setup -q -n libglade-%{version}
%patch1 -p1 -b .nowarning
%patch2 -p1 -b .secondary
%build
%{_mingw32_configure} --disable-gtk-doc
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/gtk-doc/html/libglade
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc COPYING
%{_mingw32_bindir}/libglade-2.0-0.dll
%{_mingw32_bindir}/libglade-convert
%{_mingw32_includedir}/libglade-2.0
%{_mingw32_libdir}/libglade-2.0.dll.a
%{_mingw32_libdir}/libglade-2.0.la
%{_mingw32_libdir}/pkgconfig/libglade-2.0.pc
%dir %{_mingw32_datadir}/xml/libglade
%{_mingw32_datadir}/xml/libglade/glade-2.0.dtd
%files static
%defattr(-,root,root)
%{_mingw32_libdir}/libglade-2.0.a
%changelog
* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.6.4-2
- fix static Requires
* Thu Apr 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.6.4-1
- replace %%define with %%global
- update to 2.6.4
- move static library to its own subpackage
- add secondary patch from native libglade2 package
* Fri Feb 20 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.3-5
- Rebuild for mingw32-gcc 4.4
* Fri Feb 6 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.3-4
- Include license file.
* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.3-3
- Use _smp_mflags.
- +BR mingw32-libxml2.
* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.6.3-2
- Requires pkgconfig.
* Fri Nov 28 2008 Daniel P. Berrange <berrange at redhat.com> - 2.6.3-1
- Initial build
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libglade2/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 17 Apr 2009 16:44:52 -0000 1.1
+++ .cvsignore 17 Apr 2009 19:34:40 -0000 1.2
@@ -0,0 +1 @@
+libglade-2.6.4.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-libglade2/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 17 Apr 2009 16:44:52 -0000 1.1
+++ sources 17 Apr 2009 19:34:40 -0000 1.2
@@ -0,0 +1 @@
+d1776b40f4e166b5e9c107f1c8fe4139 libglade-2.6.4.tar.bz2
More information about the fedora-extras-commits
mailing list