| 1 |
commit: 2f028f5775ee892397290e2a119cfb87a6f2a041 |
| 2 |
Author: Takuto Yoshida <otakuto.gentoo <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Dec 5 17:44:53 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 6 12:14:08 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f028f57 |
| 7 |
|
| 8 |
net-misc/tigervnc: fix encoding option to utf-8, bug #634918 and #610738 |
| 9 |
|
| 10 |
And bump internal xorg. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/610738 |
| 13 |
Closes: https://bugs.gentoo.org/634918 |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/6453 |
| 15 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
| 16 |
|
| 17 |
net-misc/tigervnc/Manifest | 1 + |
| 18 |
net-misc/tigervnc/files/java-utf8.patch | 11 ++ |
| 19 |
net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild | 190 +++++++++++++++++++++++++++++ |
| 20 |
3 files changed, 202 insertions(+) |
| 21 |
|
| 22 |
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest |
| 23 |
index b2eb9321a90..dc284f43c13 100644 |
| 24 |
--- a/net-misc/tigervnc/Manifest |
| 25 |
+++ b/net-misc/tigervnc/Manifest |
| 26 |
@@ -1,3 +1,4 @@ |
| 27 |
DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 BLAKE2B 5e4aed97f3b1e88488f1f080b11afb515d70fcf5b9a20074436a97b3a54a89bd308bacec5584263a7cd72ef3f8b8863102cbd8ab3685cb3251764f5f23f4a037 SHA512 86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573 |
| 28 |
DIST tigervnc-1.8.0.tar.gz 1433830 BLAKE2B bdbe0e11a1459dc6328c7c54e8062f0628b952e33fcbe6ffe93c1b2148b52a17fd99fcae333b2eddf5256ffd0376a83634521473c2cd8937ba95b69bf133c796 SHA512 c066e9781622e342667bf03fd6bbb94ed17b412b07c46764b7b73b2eb308c285e865cf1e901f7d218db05a0486fb3f8877e75da3c939ef0d020247713779327a |
| 29 |
DIST xorg-server-1.19.1.tar.bz2 6041792 BLAKE2B 1c67fe74812af15cb77d2e128c92466e11b3da7c984f585cdf58aa5f157a4b254ab2a58ce2f74e87d454ef1e0bf665f2b34a189c98b194c4c5e801b31f006d8c SHA512 37d413fdd96ce6b15ae20ca5028331498586044cfc7a6ab0acb99201b04063c69bcd06867f2dc33237b244ce2870a1c5a4be3cbe4560f2461894f46f8d5dbdd7 |
| 30 |
+DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c |
| 31 |
|
| 32 |
diff --git a/net-misc/tigervnc/files/java-utf8.patch b/net-misc/tigervnc/files/java-utf8.patch |
| 33 |
new file mode 100644 |
| 34 |
index 00000000000..71bd4503b77 |
| 35 |
--- /dev/null |
| 36 |
+++ b/net-misc/tigervnc/files/java-utf8.patch |
| 37 |
@@ -0,0 +1,11 @@ |
| 38 |
+--- a/java/CMakeLists.txt 2017-10-25 22:26:12.920787580 +0900 |
| 39 |
++++ b/java/CMakeLists.txt 2017-10-25 22:27:21.423007891 +0900 |
| 40 |
+@@ -9,7 +9,7 @@ find_package(Java) |
| 41 |
+ |
| 42 |
+ set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share") |
| 43 |
+ |
| 44 |
+-set(DEFAULT_JAVACFLAGS "-source 1.6 -target 1.6 -Xlint:all,-serial,-cast,-unchecked,-fallthrough,-dep-ann,-deprecation,-rawtypes") |
| 45 |
++set(DEFAULT_JAVACFLAGS "-source 1.6 -target 1.6 -encoding UTF-8 -Xlint:all,-serial,-cast,-unchecked,-fallthrough,-dep-ann,-deprecation,-rawtypes") |
| 46 |
+ set(JAVACFLAGS ${DEFAULT_JAVACFLAGS} CACHE STRING |
| 47 |
+ "Java compiler flags (Default: ${DEFAULT_JAVACFLAGS})") |
| 48 |
+ message(STATUS "Java compiler flags = ${JAVACFLAGS}") |
| 49 |
|
| 50 |
diff --git a/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild |
| 51 |
new file mode 100644 |
| 52 |
index 00000000000..745ac50ae66 |
| 53 |
--- /dev/null |
| 54 |
+++ b/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild |
| 55 |
@@ -0,0 +1,190 @@ |
| 56 |
+# Copyright 1999-2017 Gentoo Foundation |
| 57 |
+# Distributed under the terms of the GNU General Public License v2 |
| 58 |
+ |
| 59 |
+EAPI=6 |
| 60 |
+ |
| 61 |
+CMAKE_IN_SOURCE_BUILD=1 |
| 62 |
+ |
| 63 |
+inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd |
| 64 |
+ |
| 65 |
+XSERVER_VERSION="1.19.5" |
| 66 |
+ |
| 67 |
+DESCRIPTION="Remote desktop viewer display system" |
| 68 |
+HOMEPAGE="http://www.tigervnc.org" |
| 69 |
+SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz |
| 70 |
+ https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2 |
| 71 |
+ server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )" |
| 72 |
+ |
| 73 |
+LICENSE="GPL-2" |
| 74 |
+SLOT="0" |
| 75 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" |
| 76 |
+IUSE="+drm gnutls nls java +opengl pam server systemd +xorgmodule" |
| 77 |
+ |
| 78 |
+CDEPEND="virtual/jpeg:0 |
| 79 |
+ sys-libs/zlib |
| 80 |
+ >=x11-libs/libXtst-1.0.99.2 |
| 81 |
+ >=x11-libs/fltk-1.3.1 |
| 82 |
+ gnutls? ( net-libs/gnutls:= ) |
| 83 |
+ nls? ( virtual/libiconv ) |
| 84 |
+ pam? ( virtual/pam ) |
| 85 |
+ server? ( |
| 86 |
+ dev-lang/perl |
| 87 |
+ >=x11-libs/libXi-1.2.99.1 |
| 88 |
+ >=x11-libs/libXfont-1.4.2 |
| 89 |
+ >=x11-libs/libxkbfile-1.0.4 |
| 90 |
+ x11-libs/libXrender |
| 91 |
+ >=x11-libs/pixman-0.27.2 |
| 92 |
+ >=x11-apps/xauth-1.0.3 |
| 93 |
+ x11-apps/xsetroot |
| 94 |
+ >=x11-misc/xkeyboard-config-2.4.1-r3 |
| 95 |
+ opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 ) |
| 96 |
+ xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* ) |
| 97 |
+ drm? ( x11-libs/libdrm ) |
| 98 |
+ )" |
| 99 |
+ |
| 100 |
+RDEPEND="${CDEPEND} |
| 101 |
+ !net-misc/tightvnc |
| 102 |
+ !net-misc/vnc |
| 103 |
+ !net-misc/xf4vnc |
| 104 |
+ java? ( >=virtual/jre-1.5:* )" |
| 105 |
+ |
| 106 |
+DEPEND="${CDEPEND} |
| 107 |
+ amd64? ( dev-lang/nasm ) |
| 108 |
+ x86? ( dev-lang/nasm ) |
| 109 |
+ >=x11-proto/inputproto-2.2.99.1 |
| 110 |
+ >=x11-proto/xextproto-7.2.99.901 |
| 111 |
+ >=x11-proto/xproto-7.0.31 |
| 112 |
+ x11-libs/libXfont2 |
| 113 |
+ nls? ( sys-devel/gettext ) |
| 114 |
+ java? ( >=virtual/jdk-1.5 ) |
| 115 |
+ server? ( |
| 116 |
+ virtual/pkgconfig |
| 117 |
+ media-fonts/font-util |
| 118 |
+ x11-misc/util-macros |
| 119 |
+ >=x11-proto/bigreqsproto-1.1.0 |
| 120 |
+ >=x11-proto/compositeproto-0.4 |
| 121 |
+ >=x11-proto/damageproto-1.1 |
| 122 |
+ >=x11-proto/fixesproto-5.0 |
| 123 |
+ >=x11-proto/fontsproto-2.1.3 |
| 124 |
+ >=x11-proto/glproto-1.4.17 |
| 125 |
+ >=x11-proto/randrproto-1.4.0 |
| 126 |
+ >=x11-proto/renderproto-0.11 |
| 127 |
+ >=x11-proto/resourceproto-1.2.0 |
| 128 |
+ >=x11-proto/scrnsaverproto-1.1 |
| 129 |
+ >=x11-proto/videoproto-2.2.2 |
| 130 |
+ >=x11-proto/xcmiscproto-1.2.0 |
| 131 |
+ >=x11-proto/xineramaproto-1.1.3 |
| 132 |
+ >=x11-libs/xtrans-1.3.3 |
| 133 |
+ >=x11-proto/dri2proto-2.8 |
| 134 |
+ opengl? ( >=media-libs/mesa-10.3.4-r1 ) |
| 135 |
+ )" |
| 136 |
+ |
| 137 |
+PATCHES=( |
| 138 |
+ "${WORKDIR}"/patches/030_manpages.patch |
| 139 |
+ "${WORKDIR}"/patches/055_xstartup.patch |
| 140 |
+ "${FILESDIR}"/java-utf8.patch |
| 141 |
+) |
| 142 |
+ |
| 143 |
+src_prepare() { |
| 144 |
+ if use server ; then |
| 145 |
+ cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die |
| 146 |
+ fi |
| 147 |
+ |
| 148 |
+ cmake-utils_src_prepare |
| 149 |
+ |
| 150 |
+ if use server; then |
| 151 |
+ cd unix/xserver || die |
| 152 |
+ eapply "${FILESDIR}/xserver119.patch" |
| 153 |
+ eautoreconf |
| 154 |
+ fi |
| 155 |
+} |
| 156 |
+ |
| 157 |
+src_configure() { |
| 158 |
+ use arm || use hppa && append-flags "-fPIC" |
| 159 |
+ |
| 160 |
+ local mycmakeargs=( |
| 161 |
+ -DENABLE_GNUTLS=$(usex gnutls) |
| 162 |
+ -DENABLE_NLS=$(usex nls) |
| 163 |
+ -DENABLE_PAM=$(usex pam) |
| 164 |
+ -DBUILD_JAVA=$(usex java) |
| 165 |
+ ) |
| 166 |
+ |
| 167 |
+ cmake-utils_src_configure |
| 168 |
+ |
| 169 |
+ if use server; then |
| 170 |
+ cd unix/xserver || die |
| 171 |
+ econf \ |
| 172 |
+ $(use_enable opengl glx) \ |
| 173 |
+ $(use_enable drm libdrm) \ |
| 174 |
+ --disable-config-hal \ |
| 175 |
+ --disable-config-udev \ |
| 176 |
+ --disable-devel-docs \ |
| 177 |
+ --disable-dmx \ |
| 178 |
+ --disable-dri \ |
| 179 |
+ --disable-dri3 \ |
| 180 |
+ --disable-glamor \ |
| 181 |
+ --disable-kdrive \ |
| 182 |
+ --disable-libunwind \ |
| 183 |
+ --disable-linux-acpi \ |
| 184 |
+ --disable-record \ |
| 185 |
+ --disable-selective-werror \ |
| 186 |
+ --disable-silent-rules \ |
| 187 |
+ --disable-static \ |
| 188 |
+ --disable-tslib \ |
| 189 |
+ --disable-unit-tests \ |
| 190 |
+ --disable-xephyr \ |
| 191 |
+ --disable-xinerama \ |
| 192 |
+ --disable-xnest \ |
| 193 |
+ --disable-xorg \ |
| 194 |
+ --disable-xvfb \ |
| 195 |
+ --disable-xwin \ |
| 196 |
+ --disable-xwayland \ |
| 197 |
+ --enable-dri2 \ |
| 198 |
+ --with-pic \ |
| 199 |
+ --without-dtrace \ |
| 200 |
+ --disable-present \ |
| 201 |
+ --disable-unit-tests |
| 202 |
+ fi |
| 203 |
+} |
| 204 |
+ |
| 205 |
+src_compile() { |
| 206 |
+ cmake-utils_src_compile |
| 207 |
+ |
| 208 |
+ if use server; then |
| 209 |
+ # deps of the vnc module and the module itself |
| 210 |
+ local d subdirs=( |
| 211 |
+ fb xfixes Xext dbe $(usex opengl glx "") randr render damageext miext Xi xkb |
| 212 |
+ composite dix mi os hw/vnc |
| 213 |
+ ) |
| 214 |
+ for d in "${subdirs[@]}"; do |
| 215 |
+ emake -C unix/xserver/"${d}" |
| 216 |
+ done |
| 217 |
+ fi |
| 218 |
+} |
| 219 |
+ |
| 220 |
+src_install() { |
| 221 |
+ cmake-utils_src_install |
| 222 |
+ |
| 223 |
+ if use server; then |
| 224 |
+ emake -C unix/xserver/hw/vnc DESTDIR="${D}" install |
| 225 |
+ if ! use xorgmodule; then |
| 226 |
+ rm -rv "${ED%/}"/usr/$(get_libdir)/xorg || die |
| 227 |
+ else |
| 228 |
+ rm -v "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die |
| 229 |
+ fi |
| 230 |
+ |
| 231 |
+ newconfd "${FILESDIR}"/${PN}.confd ${PN} |
| 232 |
+ if use systemd; then |
| 233 |
+ systemd_douserunit contrib/systemd/user/vncserver@.service |
| 234 |
+ else |
| 235 |
+ newinitd "${FILESDIR}"/${PN}.initd ${PN} |
| 236 |
+ fi |
| 237 |
+ else |
| 238 |
+ local f |
| 239 |
+ cd "${ED}" || die |
| 240 |
+ for f in vncserver x0vncserver vncconfig; do |
| 241 |
+ rm usr/bin/$f || die |
| 242 |
+ rm usr/share/man/man1/$f.1 || die |
| 243 |
+ done |
| 244 |
+ fi |
| 245 |
+} |
Archives