rpms/tigervnc
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- rebuild against 1.6.1.901 X server (#497835)

Browse Source 
- disable i18n, vncviewer is not UTF-8 compatible (#501832)
This commit is contained in:
Adam Tkac 2009-05-21 12:28:09 +00:00
parent 7da8bd2d49
commit cbbf499832
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tigervnc.spec
View File

@ -1,6 +1,6 @@
Name: tigervnc Name: tigervnc
Version: 0.0.90 Version: 0.0.90
Release: 0.9%{?dist} Release: 0.10%{?dist}
Summary: A TigerVNC remote display system Summary: A TigerVNC remote display system
Group: User Interface/Desktops Group: User Interface/Desktops
@ -41,6 +41,7 @@ Patch4: tigervnc-cookie.patch
Patch8: tigervnc-viewer-reparent.patch Patch8: tigervnc-viewer-reparent.patch
Patch9: tigervnc10-rh499401.patch Patch9: tigervnc10-rh499401.patch
Patch10: tigervnc10-rh497592.patch Patch10: tigervnc10-rh497592.patch
Patch11: tigervnc10-rh501832.patch
%description %description
Virtual Network Computing (VNC) is a remote display system which Virtual Network Computing (VNC) is a remote display system which
@ -91,7 +92,7 @@ pushd unix/xserver
for all in `find . -type f -perm -001`; do for all in `find . -type f -perm -001`; do
chmod -x "$all" chmod -x "$all"
done done
patch -p1 --fuzz=0 -b --suffix .vnc < ../xserver16.patch patch -p1 -b --suffix .vnc < ../xserver16.patch
popd popd
@ -101,6 +102,7 @@ popd
%patch8 -p1 -b .viewer-reparent %patch8 -p1 -b .viewer-reparent
%patch9 -p0 -b .rh499401 %patch9 -p0 -b .rh499401
%patch10 -p1 -b .rh497592 %patch10 -p1 -b .rh497592
%patch11 -p1 -b .rh501832
# Use newer gettext # Use newer gettext
sed -i 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION([0.17])/' \ sed -i 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION([0.17])/' \
@ -240,6 +242,10 @@ fi
%{_libdir}/xorg/modules/extensions/libvnc.so %{_libdir}/xorg/modules/extensions/libvnc.so
%changelog %changelog
* Thu May 21 2009 Adam Tkac <atkac redhat com> 0.0.90-10
- rebuild against 1.6.1.901 X server (#497835)
- disable i18n, vncviewer is not UTF-8 compatible (#501832)
* Mon May 18 2009 Adam Tkac <atkac redhat com> 0.0.90-9 * Mon May 18 2009 Adam Tkac <atkac redhat com> 0.0.90-9
- fix vncpasswd crash on long passwords (#499401) - fix vncpasswd crash on long passwords (#499401)
- start session dbus daemon correctly (#497592) - start session dbus daemon correctly (#497592)

28
tigervnc10-rh501832.patch Normal file
View File

@ -0,0 +1,28 @@
diff -up tigervnc-0.0.90/unix/vncviewer/AboutDialog.h.rh501832 tigervnc-0.0.90/unix/vncviewer/AboutDialog.h
--- tigervnc-0.0.90/unix/vncviewer/AboutDialog.h.rh501832 2009-05-21 14:16:20.173820756 +0200
+++ tigervnc-0.0.90/unix/vncviewer/AboutDialog.h 2009-05-21 14:16:39.129309405 +0200
@@ -26,6 +26,10 @@
#include "parameters.h"
#include "gettext.h"
+
+/* Disable I18N - RH bug #501832 */
+#define gettext(arg) (arg)
+
#define _(String) gettext (String)
#define gettext_noop(String) String
#define N_(String) gettext_noop (String)
diff -up tigervnc-0.0.90/unix/vncviewer/vncviewer.cxx.rh501832 tigervnc-0.0.90/unix/vncviewer/vncviewer.cxx
--- tigervnc-0.0.90/unix/vncviewer/vncviewer.cxx.rh501832 2009-05-21 14:15:51.810818893 +0200
+++ tigervnc-0.0.90/unix/vncviewer/vncviewer.cxx 2009-05-21 14:16:09.614303459 +0200
@@ -39,6 +39,10 @@
#include "CConn.h"
#include "gettext.h"
+
+/* Disable I18N - RH bug #501832 */
+#define gettext(arg) (arg)
+
#define _(String) gettext (String)
#define gettext_noop(String) String
#define N_(String) gettext_noop (String)