rpms/ristretto/devel import.log, NONE, 1.1 ristretto-0.0.20-fix-marshaller.patch, NONE, 1.1 ristretto.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Christoph Wickert (cwickert)
fedora-extras-commits at redhat.com
Tue Jul 1 18:46:30 UTC 2008
- Previous message (by thread): rpms/usb_modeswitch/devel import.log, NONE, 1.1 usb_modeswitch.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/qpidc/F-8 .cvsignore, 1.5, 1.6 qpidc.spec, 1.13, 1.14 sources, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cwickert
Update of /cvs/pkgs/rpms/ristretto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18785/devel
Modified Files:
.cvsignore sources
Added Files:
import.log ristretto-0.0.20-fix-marshaller.patch
ristretto.spec
Log Message:
Initial import of ristretto. Review was at
https://bugzilla.redhat.com/show_bug.cgi?id=351531
--- NEW FILE import.log ---
ristretto-0_0_20-2_fc10:HEAD:ristretto-0.0.20-2.fc10.src.rpm:1214937895
ristretto-0.0.20-fix-marshaller.patch:
--- NEW FILE ristretto-0.0.20-fix-marshaller.patch ---
Index: src/picture_viewer.c
===================================================================
--- src/picture_viewer.c (Revision 5015)
+++ src/picture_viewer.c (Revision 5016)
@@ -188,6 +188,43 @@
GDK_ACTION_COPY | GDK_ACTION_LINK | GDK_ACTION_MOVE | GDK_ACTION_PRIVATE);
}
+void
+rstto_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
+ typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1,
+ gpointer arg_1,
+ gpointer arg_2,
+ gpointer data2);
+ register GMarshalFunc_VOID__OBJECT_OBJECT callback;
+ register GCClosure *cc = (GCClosure*) closure;
+ register gpointer data1, data2;
+
+ g_return_if_fail (n_param_values == 3);
+
+ if (G_CCLOSURE_SWAP_DATA (closure))
+ {
+ data1 = closure->data;
+ data2 = g_value_get_object (param_values + 0);
+ }
+ else
+ {
+ data1 = g_value_get_object (param_values + 0);
+ data2 = closure->data;
+ }
+ callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ?
+ marshal_data : cc->callback);
+
+ callback (data1,
+ g_value_get_object (param_values + 1),
+ g_value_get_object (param_values + 2),
+ data2);
+}
+
static void
rstto_picture_viewer_class_init(RsttoPictureViewerClass *viewer_class)
{
@@ -218,7 +255,7 @@
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (RsttoPictureViewerClass, set_scroll_adjustments),
NULL, NULL,
- gtk_marshal_VOID__POINTER_POINTER,
+ rstto_marshal_VOID__OBJECT_OBJECT,
G_TYPE_NONE, 2,
GTK_TYPE_ADJUSTMENT,
GTK_TYPE_ADJUSTMENT);
--- NEW FILE ristretto.spec ---
Name: ristretto
Version: 0.0.20
Release: 2%{?dist}
Summary: Image-viewer for the Xfce desktop environment
Summary(de): Bildbetrachter für die Xfce Desktop-Umgebung
Group: User Interface/Desktops
License: GPLv2+
URL: http://goodies.xfce.org/projects/applications/ristretto/
Source0: http://goodies.xfce.org/releases/ristretto/ristretto-%{version}.tar.gz
Patch0: %{name}-0.0.20-fix-marshaller.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: Thunar-devel >= 0.4, libxfcegui4-devel >= 4.4.0
BuildRequires: libexif-devel >= 0.6.0, dbus-glib-devel >= 0.34
BuildRequires: desktop-file-utils, gettext
%description
Ristretto is a fast and lightweight image-viewer for the Xfce desktop
environment.
%description -l de
Ristretto ist ein schneller und leichtgewichtiger Bildbetrachter für die Xfce
Desktop-Umgebung.
%prep
%setup -q
%patch0 -p0 -b .marshaller
%build
%configure
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
desktop-file-install --vendor fedora \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
--add-mime-type=image/tiff \
--add-mime-type=image/x-bmp \
--add-mime-type=image/x-png \
--add-mime-type=image/x-pcx \
--add-mime-type=image/x-tga \
--add-mime-type=image/xpm \
--delete-original \
${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%post
update-desktop-database &> /dev/null ||:
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%postun
update-desktop-database &> /dev/null ||:
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_bindir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%changelog
* Tue Jul 01 2008 Christoph Wickert <fedora christoph-wickert de> - 0.0.20.2
- Add patch to fix x86_64 bit bug caused by a wrong marshaller (#351531)
* Sat May 24 2008 Christoph Wickert <fedora christoph-wickert de> - 0.0.20-1
- Update to 0.0.20
* Sat May 10 2008 Christoph Wickert <fedora christoph-wickert de> - 0.0.19-1
- Update to 0.0.19
* Sat Apr 05 2008 Christoph Wickert <fedora christoph-wickert de> - 0.0.18-1
- Update to 0.0.18
* Wed Feb 17 2008 Christoph Wickert <fedora christoph-wickert de> - 0.0.17-1
- Update to 0.0.17
* Wed Jan 30 2008 Christoph Wickert <fedora christoph-wickert de> - 0.0.16-1
- Update to 0.0.16
* Mon Dec 03 2007 Christoph Wickert <fedora christoph-wickert de> - 0.0.15-1
- Update to 0.0.15
* Mon Dec 03 2007 Christoph Wickert <fedora christoph-wickert de> - 0.0.14-1
- Update to 0.0.14
* Mon Nov 26 2007 Christoph Wickert <fedora christoph-wickert de> - 0.0.13-1
- Update to 0.0.13
* Wed Nov 21 2007 Christoph Wickert <fedora christoph-wickert de> - 0.0.12-2
- Try manual_adjustments.patch
* Tue Nov 20 2007 Christoph Wickert <fedora christoph-wickert de> - 0.0.12-1
- Update to 0.0.12
* Wed Nov 07 2007 Christoph Wickert <fedora christoph-wickert de> - 0.0.11-1
- Update to 0.0.11
- BuildRequire dbus-glib-devel
* Sat Nov 03 2007 Christoph Wickert <fedora christoph-wickert de> - 0.0.10-1
- Update to 0.0.10
- Add more mimetypes: tiff, x-bmp, x-png, x-pcx, x-tga and xpm
- Correct build requirements
* Fri Oct 19 2007 Christoph Wickert <fedora christoph-wickert de> - 0.0.9-1
- Update to 0.0.9
* Sun Oct 14 2007 Christoph Wickert <fedora christoph-wickert de> - 0.0.8-1
- Update to 0.0.8
* Sun Sep 30 2007 Christoph Wickert <fedora christoph-wickert de> - 0.0.7-1
- Update to 0.0.7
* Sun Sep 09 2007 Christoph Wickert <fedora christoph-wickert de> - 0.0.4-1
- Update to 0.0.4
* Wed Sep 05 2007 Christoph Wickert <fedora christoph-wickert de> - 0.0.3-1
- Initial RPM package
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ristretto/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jul 2008 18:13:46 -0000 1.1
+++ .cvsignore 1 Jul 2008 18:45:35 -0000 1.2
@@ -0,0 +1 @@
+ristretto-0.0.20.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ristretto/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jul 2008 18:13:46 -0000 1.1
+++ sources 1 Jul 2008 18:45:35 -0000 1.2
@@ -0,0 +1 @@
+12eaaea1aaaea024ad3ce8a114ff9e6d ristretto-0.0.20.tar.gz
- Previous message (by thread): rpms/usb_modeswitch/devel import.log, NONE, 1.1 usb_modeswitch.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/qpidc/F-8 .cvsignore, 1.5, 1.6 qpidc.spec, 1.13, 1.14 sources, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list