diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 27 | ||||
| -rw-r--r-- | emojis.patch | 39 |
3 files changed, 51 insertions, 25 deletions
@@ -1,7 +1,7 @@ pkgbase = emote pkgdesc = Emoji Picker for Linux written in GTK3 - pkgver = 1.0.1 - pkgrel = 3 + pkgver = 1.2.0 + pkgrel = 1 url = https://github.com/tom-james-watson/Emote arch = any license = GPL3 @@ -14,10 +14,10 @@ pkgbase = emote depends = libkeybinder3 source = setup.py source = emojis.patch - source = https://github.com/tom-james-watson/Emote/archive/v1.0.1.tar.gz + source = https://github.com/tom-james-watson/Emote/archive/dbff57507b20b4e723f1b82a9506809810711276.tar.gz sha512sums = 83b6697b96882d3854c0f64a208571bfeec3e6324790e5508a6bd32092c5d462e86fa676c561111d98cce8058f1730303658612427b66daac086236e3e365316 - sha512sums = d06513f492a91b2140928b9e116be079b5fb09f8df38d84d0697a1791b470155e130dfdd42d9c3a4167771ca8a1e249a2840ff9e72b1d2feb819a223d6d4c340 - sha512sums = 258c6333109571c8d008f8663a6864b9155100ac9afc083aa08008086c748ec6bc9d3711c2f2be9c8cc53c31dcc98cfa9fbeb6b5186301eec5821a546bf90aaa + sha512sums = cefe0364d1adcfdd914c8a265a7e9146506d03bd6208c6b1dd54fbd65daa276ef48fa2936f622e1aba694caf29dd3041af6f54a9e200d98de838f7d12852e746 + sha512sums = 2dae4a078c006a64b2ece589e55a6aa392292cbd5fd596e3b08bdeb50977e6859b359b66fdbad7ae9d30c3bb5fafb90744a4add0aef4950cf8cdff91921f8fed pkgname = emote @@ -1,8 +1,9 @@ # Maintainer: Luke Arms <luke@arms.to> pkgname=emote -pkgver=1.0.1 -pkgrel=3 +pkgver=1.2.0 +_pkgref=dbff57507b20b4e723f1b82a9506809810711276 +pkgrel=1 url="https://github.com/tom-james-watson/Emote" pkgdesc="Emoji Picker for Linux written in GTK3" arch=('any') @@ -12,38 +13,38 @@ makedepends=('python-setuptools' 'python-pipenv') source=( "setup.py" "emojis.patch" - "https://github.com/tom-james-watson/Emote/archive/v${pkgver}.tar.gz" + "https://github.com/tom-james-watson/Emote/archive/${_pkgref}.tar.gz" ) sha512sums=( '83b6697b96882d3854c0f64a208571bfeec3e6324790e5508a6bd32092c5d462e86fa676c561111d98cce8058f1730303658612427b66daac086236e3e365316' - 'd06513f492a91b2140928b9e116be079b5fb09f8df38d84d0697a1791b470155e130dfdd42d9c3a4167771ca8a1e249a2840ff9e72b1d2feb819a223d6d4c340' - '258c6333109571c8d008f8663a6864b9155100ac9afc083aa08008086c748ec6bc9d3711c2f2be9c8cc53c31dcc98cfa9fbeb6b5186301eec5821a546bf90aaa' + 'cefe0364d1adcfdd914c8a265a7e9146506d03bd6208c6b1dd54fbd65daa276ef48fa2936f622e1aba694caf29dd3041af6f54a9e200d98de838f7d12852e746' + '2dae4a078c006a64b2ece589e55a6aa392292cbd5fd596e3b08bdeb50977e6859b359b66fdbad7ae9d30c3bb5fafb90744a4add0aef4950cf8cdff91921f8fed' ) build() { # Replace setup.py - mv -f "$srcdir/setup.py" "$srcdir/Emote-$pkgver/setup.py" + mv -f "$srcdir/setup.py" "$srcdir/Emote-$_pkgref/setup.py" # Apply emoji patch - patch -d "$srcdir/Emote-$pkgver" -p1 <emojis.patch + patch -d "$srcdir/Emote-$_pkgref" -p1 <emojis.patch # Move static files into the library - mv -T "$srcdir/Emote-$pkgver/static" "$srcdir/Emote-$pkgver/emote/static" + mv -T "$srcdir/Emote-$_pkgref/static" "$srcdir/Emote-$_pkgref/emote/static" # Fix relative paths - find "$srcdir/Emote-$pkgver" -type f -name "*.py" -print0 | + find "$srcdir/Emote-$_pkgref" -type f -name "*.py" -print0 | xargs -0 \ sed -Ei 's/"static\/[^"]*"/os.path.join(os.path.dirname(__file__), &)/g' # Fix .desktop file - sed -Ei 's/\$\{SNAP\}//' "$srcdir/Emote-$pkgver/snap/gui/emote.desktop" + sed -Ei 's/\$\{SNAP\}//' "$srcdir/Emote-$_pkgref/snap/gui/emote.desktop" # Fix version number sed -Ei \ "s/os\\.environ\\.get\\(\"SNAP_VERSION\", \"dev build\"\\)/\"$pkgver\"/" \ - "$srcdir/Emote-$pkgver/emote/picker.py" - cd "$srcdir/Emote-$pkgver" + "$srcdir/Emote-$_pkgref/emote/picker.py" + cd "$srcdir/Emote-$_pkgref" EMOTE_VERSION="$pkgver" \ python setup.py build } package() { - cd "$srcdir/Emote-$pkgver" + cd "$srcdir/Emote-$_pkgref" EMOTE_VERSION="$pkgver" \ python setup.py install --root="$pkgdir" --optimize=1 --skip-build install -d -m 0755 "$pkgdir/etc/xdg/autostart" diff --git a/emojis.patch b/emojis.patch index 657f41e8b055..2102f2749f43 100644 --- a/emojis.patch +++ b/emojis.patch @@ -1,4 +1,5 @@ diff --git a/emote/emojis.py b/emote/emojis.py +index 333e021..829a1c5 100644 --- a/emote/emojis.py +++ b/emote/emojis.py @@ -47,7 +47,10 @@ def update_recent_category(): @@ -14,6 +15,7 @@ diff --git a/emote/emojis.py b/emote/emojis.py {"char": char, "category": "recent", "name": emoji["name"]} ) diff --git a/static/emojis.json b/static/emojis.json +index 5763645..67ff57e 100644 --- a/static/emojis.json +++ b/static/emojis.json @@ -343,7 +343,7 @@ @@ -852,7 +854,30 @@ diff --git a/static/emojis.json b/static/emojis.json "fitzpatrick_scale": false, "category": "symbols" }, -@@ -7387,7 +7387,7 @@ +@@ -7367,19 +7367,19 @@ + "fitzpatrick_scale": false, + "category": "symbols" + }, +- "female-sign":{ ++ "female-sign": { + "keywords": ["woman", "venus", "gender", "sex"], + "char": "♀️", + "fitzpatrick_scale": false, + "category": "symbols" + }, +- "male-sign":{ ++ "male-sign": { + "keywords": ["man", "mars", "gender", "sex"], + "char": "♂️", + "fitzpatrick_scale": false, + "category": "symbols" + }, +- "transgender-symbol":{ ++ "transgender-symbol": { + "keywords": ["gender", "sex"], + "char": "⚧️", + "fitzpatrick_scale": false, +@@ -7405,7 +7405,7 @@ }, "curly_loop": { "keywords": ["scribble", "draw", "shape", "squiggle"], @@ -861,7 +886,7 @@ diff --git a/static/emojis.json b/static/emojis.json "fitzpatrick_scale": false, "category": "symbols" }, -@@ -7405,19 +7405,19 @@ +@@ -7423,19 +7423,19 @@ }, "heavy_plus_sign": { "keywords": ["math", "calculation", "addition", "more", "increase"], @@ -884,7 +909,7 @@ diff --git a/static/emojis.json b/static/emojis.json "fitzpatrick_scale": false, "category": "symbols" }, -@@ -7429,7 +7429,7 @@ +@@ -7447,7 +7447,7 @@ }, "infinity": { "keywords": ["forever"], @@ -893,7 +918,7 @@ diff --git a/static/emojis.json b/static/emojis.json "fitzpatrick_scale": false, "category": "symbols" }, -@@ -7507,13 +7507,13 @@ +@@ -7525,13 +7525,13 @@ }, "white_circle": { "keywords": ["shape", "round"], @@ -909,7 +934,7 @@ diff --git a/static/emojis.json b/static/emojis.json "fitzpatrick_scale": false, "category": "symbols" }, -@@ -7573,13 +7573,13 @@ +@@ -7597,13 +7597,13 @@ }, "black_large_square": { "keywords": ["shape", "icon", "button"], @@ -925,7 +950,7 @@ diff --git a/static/emojis.json b/static/emojis.json "fitzpatrick_scale": false, "category": "symbols" }, -@@ -7603,13 +7603,13 @@ +@@ -7627,13 +7627,13 @@ }, "black_medium_small_square": { "keywords": ["icon", "shape", "button"], @@ -941,7 +966,7 @@ diff --git a/static/emojis.json b/static/emojis.json "fitzpatrick_scale": false, "category": "symbols" }, -@@ -9391,7 +9391,7 @@ +@@ -9415,7 +9415,7 @@ }, "pirate_flag": { "keywords": ["skull", "crossbones", "flag", "banner"], |