X-Original-To: alpine-aports@lists.alpinelinux.org Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by lists.alpinelinux.org (Postfix) with ESMTP id 32AC6F815EF for ; Sun, 24 Mar 2019 17:55:13 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 6AC694672; Sun, 24 Mar 2019 13:55:12 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 24 Mar 2019 13:55:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sent.com; h=from :to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=fm3; bh=L13SgelHqs7pBsxfypJ9TUxTLX 5ddXGgzdtsFBsXjUI=; b=yoRYwST2yV8e6ru65TKMDEHs8AZH7y/iCnNjoQ1VnO 0+SqSJ3RUqUA+mnm5nLjqsFR4uJPQRs1YSTcJrc6qfidZRYCyka6YXPRMQeuGB1r LC2ugUdfcxAeRWgnxyF9Q51dgxwVj8q8dgOrkhWEUOVy3nQLxAyesEKcQYNIMlWB /jwQ8saJVSxXNUUYZvqdBnKt7X/BOyJ+N2AKKai0VZjwQKpLXBUd80AmsTohxWOh /uJY0VWkrnmYklKAPAfIvBRU65DS59r5ivvA+12IIJFIPtv7tUekGNBEIx35IPtA snlhNXE+NdPac83k2TlcP1VJfxBIkt3gd4m6YghHX8bw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=L13SgelHqs7pBsxfy pJ9TUxTLX5ddXGgzdtsFBsXjUI=; b=osSEkybq5ByfaemxLXA8o/onFHDAXnUjv sdHNNMJU6EwBcTNKCLprzka61ka5sAOq55GPYigdw1Djr8upSHIZE09GVRb6DWW6 309CFN2YRG5OXi5F/7beKqj1SHKXSQ8bbjg51C9yx51FMDwq5LWfTqROQ/dOYuZA 6vcrNlBkVlqZisntOPnUZF5UBfoZER5NXM0KS4rMGvY6uyAuQX+yCjtm0BA0yD45 QBJ4+sS5GRikZhU8Oyumzm4DgKRNZrcKs0tbpEQCEltuPJTvj8/dGgs3P36Y+hSG Ya5EzaapAFJx8xSIt5Yr2co6CKz87IbRkGfaL0TEE9OihX3ps3aRQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddrjeeigddutdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomheprfgruhhluceurhgvuggsuhhrhicuoegsrhgvsghssehsvghnthdr tghomheqnecuffhomhgrihhnpehfrhgvvgguvghskhhtohhprdhorhhgpdhgihhthhhusg drtghomhdpgidrohhrghenucfkphepjeelrdejfedrudefiedrvddvgeenucfrrghrrghm pehmrghilhhfrhhomhepsghrvggsshesshgvnhhtrdgtohhmnecuvehluhhsthgvrhfuih iivgeptd X-ME-Proxy: Received: from brebsc.lan (79-73-136-224.dynamic.dsl.as9105.com [79.73.136.224]) by mail.messagingengine.com (Postfix) with ESMTPA id 34B3410311 for ; Sun, 24 Mar 2019 13:55:11 -0400 (EDT) Received: from localhost ([127.0.0.1] helo=brebsc.lan) by brebsc.lan with esmtp (Exim 4.92) (envelope-from ) id 1h87Kv-0005b5-93; Sun, 24 Mar 2019 17:55:09 +0000 From: Paul Bredbury To: alpine-aports@lists.alpinelinux.org Cc: Paul Bredbury Subject: [alpine-aports] [PATCH] main/xkeyboard-config: upgrade to 2.26 Date: Sun, 24 Mar 2019 17:55:02 +0000 Message-Id: <20190324175502.21474-1-brebs@sent.com> X-Mailer: git-send-email 2.21.0 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The pt-layout patch is needed, for successful compilation. --- main/xkeyboard-config/APKBUILD | 10 ++-- main/xkeyboard-config/pt-layout.patch | 83 +++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 4 deletions(-) create mode 100644 main/xkeyboard-config/pt-layout.patch diff --git a/main/xkeyboard-config/APKBUILD b/main/xkeyboard-config/APKBUILD index eaa590c73c..383969ebe3 100644 --- a/main/xkeyboard-config/APKBUILD +++ b/main/xkeyboard-config/APKBUILD @@ -1,15 +1,16 @@ # Maintainer: Natanael Copa pkgname=xkeyboard-config -pkgver=2.22 +pkgver=2.26 pkgrel=0 pkgdesc="X keyboard configuration files" url="http://www.freedesktop.org/wiki/Software/XKeyboardConfig" arch="noarch" license="custom" depends= -subpackages= +subpackages="$pkgname-doc" makedepends="xkbcomp intltool libx11-dev" source="https://www.x.org/archive/individual/data/xkeyboard-config/xkeyboard-config-$pkgver.tar.bz2 + pt-layout.patch " builddir="$srcdir/$pkgname-$pkgver" @@ -37,6 +38,7 @@ package() { make DESTDIR="$pkgdir" install rm -f "$pkgdir"/usr/share/X11/xkb/compiled install -m755 -d "$pkgdir"/var/lib/xkb - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -sha512sums="1697cc1a49625eb608d8ab1f54f9f37e37facc482fc8bae5ebff9e3336efdd2f57e0ed95db0a9745d49f1bc21e2cfa792d0849f4057745d8be8f7abac4893f97 xkeyboard-config-2.22.tar.bz2" +sha512sums="5c8a31f7a6ad5daed8a3fceb56230b2e2fc04a25f52a43b3b4ea81e4a6ab15c52869f749c4b747d855cd4b618c04bcbb40e85dec7eab31fbe3bd45e8c9b755ef xkeyboard-config-2.26.tar.bz2 +2ff06af0d539202b3b4c372ed05245cb3e944a40e103eabede28deb3c258058d45e6a712682a9fba43d51731013bd4ce0c8bf5e6b1fd92919646b543e94709ba pt-layout.patch" diff --git a/main/xkeyboard-config/pt-layout.patch b/main/xkeyboard-config/pt-layout.patch new file mode 100644 index 0000000000..645d23d7cc --- /dev/null +++ b/main/xkeyboard-config/pt-layout.patch @@ -0,0 +1,83 @@ +From https://github.com/freedesktop/xkeyboard-config/commit/af6c0f29dbee1cc7b280eed891592797c2e31220 + +From af6c0f29dbee1cc7b280eed891592797c2e31220 Mon Sep 17 00:00:00 2001 +From: Sergey Udaltsov +Date: Thu, 7 Feb 2019 20:40:35 +0000 +Subject: [PATCH] Fixed broken pt layout + +Backticks broke it, removed +--- + symbols/pt | 62 +++++++++++++++++++++++++++--------------------------- + 1 file changed, 31 insertions(+), 31 deletions(-) + +diff --git a/symbols/pt b/symbols/pt +index 73a1b7b..3ec0981 100644 +--- a/symbols/pt ++++ b/symbols/pt +@@ -221,35 +221,35 @@ xkb_symbols "colemak" { + + name[Group1]="Portuguese (Colemak)"; + +- key `` { [ q, Q, at, Greek_OMEGA ] }; +- key `` { [ w, W, lstroke, Lstroke ] }; +- key `` { [ f, F, dstroke, ordfeminine ] }; +- key `` { [ p, P, thorn, THORN ] }; +- key `` { [ g, G, eng, ENG ] }; +- key `` { [ j, J, dead_hook, dead_horn ] }; +- key `` { [ l, L, lstroke, Lstroke ] }; +- key `` { [ u, U, downarrow, uparrow ] }; +- key `` { [ y, Y, leftarrow, yen ] }; +- key `` { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] }; +- +- key `` { [ a, A, ae, AE ] }; +- key `` { [ r, R, paragraph, registered ] }; +- key `` { [ s, S, ssharp, section ] }; +- key `` { [ t, T, tslash, Tslash ] }; +- key `` { [ d, D, eth, ETH ] }; +- key `` { [ h, H, hstroke, Hstroke ] }; +- key `` { [ n, N, n, N ] }; +- key `` { [ e, E, EuroSign, cent ] }; +- key `` { [ i, I, rightarrow, idotless ] }; +- key `` { [ o, O, oslash, Ooblique ] }; +- +- key `` { [ z, Z, guillemotleft, less ] }; +- key `` { [ x, X, guillemotright, greater ] }; +- key `` { [ c, C, cent, copyright ] }; +- key `` { [ v, V, leftdoublequotemark, leftsinglequotemark ] }; +- key `` { [ b, B, rightdoublequotemark, rightsinglequotemark ] }; +- key `` { [ k, K, kra, ampersand ] }; +- key `` { [ m, M, mu, masculine ] }; +- +- key `` { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; ++ key { [ q, Q, at, Greek_OMEGA ] }; ++ key { [ w, W, lstroke, Lstroke ] }; ++ key { [ f, F, dstroke, ordfeminine ] }; ++ key { [ p, P, thorn, THORN ] }; ++ key { [ g, G, eng, ENG ] }; ++ key { [ j, J, dead_hook, dead_horn ] }; ++ key { [ l, L, lstroke, Lstroke ] }; ++ key { [ u, U, downarrow, uparrow ] }; ++ key { [ y, Y, leftarrow, yen ] }; ++ key { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] }; ++ ++ key { [ a, A, ae, AE ] }; ++ key { [ r, R, paragraph, registered ] }; ++ key { [ s, S, ssharp, section ] }; ++ key { [ t, T, tslash, Tslash ] }; ++ key { [ d, D, eth, ETH ] }; ++ key { [ h, H, hstroke, Hstroke ] }; ++ key { [ n, N, n, N ] }; ++ key { [ e, E, EuroSign, cent ] }; ++ key { [ i, I, rightarrow, idotless ] }; ++ key { [ o, O, oslash, Ooblique ] }; ++ ++ key { [ z, Z, guillemotleft, less ] }; ++ key { [ x, X, guillemotright, greater ] }; ++ key { [ c, C, cent, copyright ] }; ++ key { [ v, V, leftdoublequotemark, leftsinglequotemark ] }; ++ key { [ b, B, rightdoublequotemark, rightsinglequotemark ] }; ++ key { [ k, K, kra, ampersand ] }; ++ key { [ m, M, mu, masculine ] }; ++ ++ key { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; + }; -- 2.21.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---