From b368d02f01c58b95ab2b9d82b0a921e0a58f40cb Mon Sep 17 00:00:00 2001 From: "Brian P. Hinz" Date: Sun, 1 Mar 2015 21:51:49 -0500 Subject: [PATCH] Bump version of fltk to 1.3.3 for el5, el6, & ubuntu packages --- .../packages/deb/ubuntu-precise/debian/rules | 4 ++-- contrib/packages/deb/ubuntu-trusty/debian/rules | 4 ++-- contrib/packages/rpm/el5/SPECS/tigervnc.spec | 11 +++++------ contrib/packages/rpm/el6/SPECS/tigervnc.spec | 17 +++++++---------- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/contrib/packages/deb/ubuntu-precise/debian/rules b/contrib/packages/deb/ubuntu-precise/debian/rules index 29f5632f..17686cef 100755 --- a/contrib/packages/deb/ubuntu-precise/debian/rules +++ b/contrib/packages/deb/ubuntu-precise/debian/rules @@ -53,8 +53,8 @@ config-stamp: cmake -G"Unix Makefiles" \ -DBUILD_STATIC=off \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DFLTK_LIBRARIES="$(CURDIR)/fltk-1.3.2/lib/libfltk.a;$(CURDIR)/fltk-1.3.2/lib/libfltk_images.a;-lpng" \ - -DFLTK_INCLUDE_DIR=$(CURDIR)/fltk-1.3.2 + -DFLTK_LIBRARIES="$(CURDIR)/fltk-1.3.3/lib/libfltk.a;$(CURDIR)/fltk-1.3.3/lib/libfltk_images.a;-lpng" \ + -DFLTK_INCLUDE_DIR=$(CURDIR)/fltk-1.3.3 (cd unix/xserver; \ export PIXMANINCDIR=/usr/include/pixman-1; \ autoreconf -fiv; \ diff --git a/contrib/packages/deb/ubuntu-trusty/debian/rules b/contrib/packages/deb/ubuntu-trusty/debian/rules index 515cf2fa..4ad2c137 100755 --- a/contrib/packages/deb/ubuntu-trusty/debian/rules +++ b/contrib/packages/deb/ubuntu-trusty/debian/rules @@ -60,8 +60,8 @@ config-stamp: cmake -G"Unix Makefiles" \ -DBUILD_STATIC=off \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DFLTK_LIBRARIES="$(CURDIR)/fltk-1.3.2/lib/libfltk.a;$(CURDIR)/fltk-1.3.2/lib/libfltk_images.a;-lpng" \ - -DFLTK_INCLUDE_DIR=$(CURDIR)/fltk-1.3.2 + -DFLTK_LIBRARIES="$(CURDIR)/fltk-1.3.3/lib/libfltk.a;$(CURDIR)/fltk-1.3.3/lib/libfltk_images.a;-lpng" \ + -DFLTK_INCLUDE_DIR=$(CURDIR)/fltk-1.3.3 (cd unix/xserver; \ export PIXMANINCDIR=/usr/include/pixman-1; \ autoreconf -fiv; \ diff --git a/contrib/packages/rpm/el5/SPECS/tigervnc.spec b/contrib/packages/rpm/el5/SPECS/tigervnc.spec index d1b2065d..161eeed8 100644 --- a/contrib/packages/rpm/el5/SPECS/tigervnc.spec +++ b/contrib/packages/rpm/el5/SPECS/tigervnc.spec @@ -5,7 +5,7 @@ Name: tigervnc Version: @VERSION@ -Release: 3%{?snap:.%{snap}}%{?dist} +Release: 4%{?snap:.%{snap}}%{?dist} Summary: A TigerVNC remote display system Group: User Interface/Desktops @@ -18,7 +18,7 @@ Source1: vncserver.service Source2: vncserver.sysconfig Source6: vncviewer.desktop Source9: FindX11.cmake -Source11: http://fltk.org/pub/fltk/1.3.2/fltk-1.3.2-source.tar.gz +Source11: http://fltk.org/pub/fltk/1.3.3/fltk-1.3.3-source.tar.gz Source12: http://downloads.sourceforge.net/project/libjpeg-turbo/1.3.0/libjpeg-turbo-1.3.0.tar.gz Source100: http://www.x.org/releases/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2 @@ -274,10 +274,6 @@ sed -i -e "s#@_libdir@#%{xorg_buildroot}%{_libdir}#" cmake/Modules/FindX11.cmake tar xzf %SOURCE11 pushd fltk-* -for p in `find ../contrib/fltk -maxdepth 1 -type f -name "*.patch"|sort` ; -do - patch -p1 -i $p -done # Search paths for X11 are hard coded into FindX11.cmake cp %SOURCE9 CMake/ sed -i -e "s#@_includedir@#%{xorg_buildroot}%{_includedir}#" CMake/FindX11.cmake @@ -914,6 +910,9 @@ fi %{_datadir}/icons/hicolor/*/apps/* %changelog +* Thu Feb 19 2015 Brian P. Hinz 1.4.80-4 +- Bumped fltk to 1.3.3, no longer requires patching + * Mon Jan 19 2015 Brian P. Hinz 1.4.0-3 - Added default font paths to Xvnc and fontconfig - Added vendor strings to Xvnc diff --git a/contrib/packages/rpm/el6/SPECS/tigervnc.spec b/contrib/packages/rpm/el6/SPECS/tigervnc.spec index d16a416c..7047ab19 100644 --- a/contrib/packages/rpm/el6/SPECS/tigervnc.spec +++ b/contrib/packages/rpm/el6/SPECS/tigervnc.spec @@ -2,7 +2,7 @@ Name: tigervnc Version: @VERSION@ -Release: 18%{?snap:.%{snap}}%{?dist} +Release: 19%{?snap:.%{snap}}%{?dist} Summary: A TigerVNC remote display system Group: User Interface/Desktops @@ -14,7 +14,7 @@ Source0: %{name}-%{version}%{?snap:-%{snap}}.tar.bz2 Source1: vncserver.service Source2: vncserver.sysconfig Source6: vncviewer.desktop -Source11: http://fltk.org/pub/fltk/1.3.2/fltk-1.3.2-source.tar.gz +Source11: http://fltk.org/pub/fltk/1.3.3/fltk-1.3.3-source.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libX11-devel, automake, autoconf, libtool, gettext, gettext-devel @@ -144,12 +144,6 @@ This package contains icons for TigerVNC viewer %patch11 -p1 -b .gethomedir tar xzf %SOURCE11 -pushd fltk-* -for p in `find ../contrib/fltk -maxdepth 1 -type f -name "*.patch"|sort` ; -do - patch -p1 -i $p -done -popd cp -r /usr/share/xorg-x11-server-source/* unix/xserver pushd unix/xserver @@ -186,8 +180,8 @@ popd %{cmake28} -G"Unix Makefiles" \ -DBUILD_STATIC=off \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DFLTK_LIBRARIES="%{tigervnc_src_dir}/fltk-1.3.2/lib/libfltk.a;%{tigervnc_src_dir}/fltk-1.3.2/lib/libfltk_images.a;-lpng" \ - -DFLTK_INCLUDE_DIR=%{tigervnc_src_dir}/fltk-1.3.2 + -DFLTK_LIBRARIES="%{tigervnc_src_dir}/fltk-1.3.3/lib/libfltk.a;%{tigervnc_src_dir}/fltk-1.3.3/lib/libfltk_images.a;-lpng" \ + -DFLTK_INCLUDE_DIR=%{tigervnc_src_dir}/fltk-1.3.3 make LDFLAGS="-lpng" %{?_smp_mflags} pushd unix/xserver @@ -344,6 +338,9 @@ fi %{_datadir}/icons/hicolor/*/apps/* %changelog +* Thu Feb 19 2015 Brian P. Hinz 1.4.80-19 +- Bumped fltk version to 1.3.3, no longer requires any patching + * Tue Nov 04 2014 Brian P. Hinz 1.3.80-18.20131128svn5139 - Bumped xserver patch to keep pace with native version -- 2.39.5