Skip to content

Commit 53d2d57

Browse files
fsvm88fsvm88
authored
Merge pull request #136 from feature/1.0.7
feature/1.0.7
2 parents b649684 + f014a2c commit 53d2d57

File tree

80 files changed

+228
-1656
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+228
-1656
lines changed

‎cosmic-base/cosmic-applets/Manifest‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
DIST cosmic-applets-1.0.4-crates.tar.zst 88301312 BLAKE2B 744c1483eb037f401679b142a2025b26b20905e73c925e2748c7194dedba08d8232fd2e4591a8d137d78dca7b62f7b059410d4039a671b1fe0250beba7b8e762 SHA512 d58d19e2d5a6a6841ec3f51f63fbb3b9f42bcce1191771068cd6581db56558483ba83386d7eca3ddaa30e5427a19ac82af0123020905ab2861624ce8fc05d84b
2-
DIST cosmic-applets-1.0.4.tar.gz 344144 BLAKE2B 37fc570bcc19adf6889cd842b6de5ab75b4d63f644657bc3b3f8c8f244a4d50c6ee480c9968c29f3db836198703d8a2b1e9dddb2b6ec9e26d484345133fd9896 SHA512 70f74adf70734dceb6b3945f6d1729d6eb30d0dd73b9fac799cf607d7c2b80d2092a5f86279623607abea76480638e9a5ec91ad3a8b4b2842a17acfb92a85d08
3-
DIST cosmic-applets-1.0.5-crates.tar.zst 88265153 BLAKE2B 047be9f40b74090bccae74b778fd06988f1332de3c8030ae6e956a98b732fcdbef605376955ebf5363d02ed9f7a8797012da04fb40a1a43ce534bbff973e57ed SHA512 96970be39c3b093097ec2a06340fd33f010b4076411ed82b69eeb585b3a5bb21b19ab8492607764aa183d99e002642549df96a5c04ad3f71fe4692513aed1878
4-
DIST cosmic-applets-1.0.5.tar.gz 346940 BLAKE2B 0c29e4dc590fd0b3c28ab967bb3ee94e66dfbdbce777af676f88d47e5107665f9bb65fdb016dbd63bd2d0b91499df01f9d8a7e74621637e0997765f72c8e7b99 SHA512 12c5502647052586c58691266d42b30003f804aaf73447e8ff8cc969956bee10640cabb4730286530b8f5f93265eef9f58b03610370bcf0476c5fb67ed8c0695
51
DIST cosmic-applets-1.0.6.full.tar.zst 81591620 BLAKE2B e2e42cb3c97cad76f207e5ac9b9f4a584aecb6a4b6ff1e80481c28f795a42abe35708c7d53275d9996fb0e6172600af86e545ef75742c2edd50198d65f8f7f2e SHA512 4d2e9ab16adb3ba016f1fa70b074c47feee5edaf932b9468de14472f722c531e25be8ed42b74eb407ffaaeb4f71b64d2d71b12933fc6a0a902b2413485aacd77
2+
DIST cosmic-applets-1.0.7.full.tar.zst 81609419 BLAKE2B 3927375a5b25039bd410699cad190d0bede0b0f5fe182b7f0e45bd14bc3fcf0323e8fd24d98fa2ab9db4162e28d6b0c569b3830a6b069f6b7f06a7e8d593bc43 SHA512 53dfb37c50c3d2e0ba3007e559fda9308f46f826650673855853f031f4846db7ce3140b43e2b6a7ed90fbc8c2cc2336440c634898cc814be90406d860cece2f7

‎cosmic-base/cosmic-applets/cosmic-applets-1.0.5.ebuild‎

Lines changed: 0 additions & 97 deletions
This file was deleted.

cosmic-base/cosmic-applets/cosmic-applets-1.0.4.ebuild renamed to cosmic-base/cosmic-applets/cosmic-applets-1.0.7.ebuild

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,12 @@
33

44
EAPI=8
55

6-
inherit cosmic-de desktop
6+
inherit cosmic-de-r2 desktop systemd
77

88
DESCRIPTION="applets for COSMIC DE"
99
HOMEPAGE="https://github.com/pop-os/cosmic-applets"
1010

11-
MY_PV="epoch-1.0.4"
12-
13-
SRC_URI="
14-
https://github.com/pop-os/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${PN}-${PV}.tar.gz
15-
https://github.com/fsvm88/cosmic-overlay/releases/download/${PV}/${P}-crates.tar.zst
16-
"
11+
SRC_URI="https://github.com/fsvm88/cosmic-overlay/releases/download/${PV}/${PN}-${PVR}.full.tar.zst"
1712

1813
# use cargo-license for a more accurate license picture
1914
LICENSE="GPL-3"
@@ -55,9 +50,16 @@ _install_button() {
5550
domenu "${1}/data/${2}.desktop"
5651
}
5752

53+
src_prepare() {
54+
# Prepare status notifier watcher services (dbus + systemd)
55+
sed "s|@bindir@|${EPREFIX}/usr/bin|" cosmic-applet-status-area/data/dbus-1/com.system76.CosmicStatusNotifierWatcher.service.in > cosmic-applet-status-area/data/dbus-1/com.system76.CosmicStatusNotifierWatcher.service
56+
sed "s|@bindir@|${EPREFIX}/usr/bin|" cosmic-applet-status-area/data/com.system76.CosmicStatusNotifierWatcher.service.in > cosmic-applet-status-area/data/com.system76.CosmicStatusNotifierWatcher.service
57+
cosmic-de-r2_src_prepare
58+
}
59+
5860
src_install() {
5961
# This git project now creates one multicall binary
60-
dobin "$(cosmic-de_target_dir)/${PN}"
62+
dobin "$(cosmic-common_target_dir)/${PN}"
6163

6264
# Install applets:
6365
# - s-link to multicall binary
@@ -89,9 +91,14 @@ src_install() {
8991
_link_applet "cosmic-panel-button"
9092

9193
# Install metainfo
92-
cosmic-de_install_metainfo data/com.system76.CosmicApplets.metainfo.xml
94+
cosmic-common_install_metainfo data/com.system76.CosmicApplets.metainfo.xml
9395

9496
# Install default schema
9597
insinto /usr/share/cosmic
9698
doins -r cosmic-app-list/data/default_schema/*
99+
100+
# Install status notifier watcher services (dbus + systemd)
101+
insinto /usr/share/dbus-1/services
102+
doins cosmic-applet-status-area/data/dbus-1/com.system76.CosmicStatusNotifierWatcher.service
103+
systemd_douserunit cosmic-applet-status-area/data/com.system76.CosmicStatusNotifierWatcher.service
97104
}

‎cosmic-base/cosmic-applibrary/Manifest‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
DIST cosmic-applibrary-1.0.4-crates.tar.zst 73052195 BLAKE2B ad924161dbb175d4e86bfd28863a9b178d4e02389c4c8fd76faf6dde64d96f29a0c6f28c95b1dd6b5dbd8f53d76041139956f487272d79c081f26ff19f88e6b9 SHA512 1b70ad29424706b9bfeab4562c12dfcac6929e5b8d316f931735f84f0b119d89d0adafbb5d424b511162a02f8472282b493b600dfc6b1c88e1229332f1013929
2-
DIST cosmic-applibrary-1.0.4.tar.gz 102824 BLAKE2B 6fa46b0f0dfb23ba826385ac27283ae62b58c20c41b7051145c7072beaa2e1cf8196c571e4739ea49aba7917760508c7e7dedb991d1e7bc731fb7dfa899cc8c9 SHA512 ee6b2fd6301c2caf3f94fad73f911003dbebfd89e9a0ae780eab5294d6a55c12aaa9a8586f08314a468001ace8fa6ea96502f2b6d53e530c87ea4100238368cf
3-
DIST cosmic-applibrary-1.0.5-crates.tar.zst 73485001 BLAKE2B 45aeb9ab2eac4e8ac2313e82d830723ad94eea064967e58e25b11ed020067e2b8020f1ed5105d53bc55bd740b61f9d9d50401f9b0cc9edf49b3ea9cd4507b463 SHA512 3159905285097164992e72c251690b6fc2239e56de1410f7a660d63b846be381e1fd2fa0d23c13dc1fa23c6156652b9ca17745e7f5f2c47c976b2d4377195f1d
4-
DIST cosmic-applibrary-1.0.5.tar.gz 103114 BLAKE2B 316e18b7e528b3323b248427bb95799e863da501bf9ef098c85a68c7b525c09415b08af24bf2fa0f10b5a949de467f9d057a399c9d2b82d05e949265e19c82a1 SHA512 8d7fc418ec3917d71ca29488919ffa7b4e1549aa04de7ac36ba978ecc6c290331f5f266baea51681fa753b5a979279b03405051af50e907e060158d016d257bc
51
DIST cosmic-applibrary-1.0.6.full.tar.zst 67738668 BLAKE2B dbbcc4625fbab657e5eefc2ae220caa61514bcd88e8b37825a91413ea403a529e5e27b48f31d91f59b6ff007fd56aa3a0d761f35b3b0feb16f7fa25c65cc4d3e SHA512 22a0caa627cca6565aea17bd62ac714a424d9ad2e7a70e70204980654d36ef98ce020a43a32adbc1bbfae69465471c941d1530cd549a61d243785aaa1c4a4266
2+
DIST cosmic-applibrary-1.0.7.full.tar.zst 67746413 BLAKE2B f87851371f0dc65599307711a8e1d34f7afd22fdcab0c8c0c0ae1cdd5fadf4d6bf23c8a7890cfef6e2ad9d1c538c0659d42ad60b22d25ce04b50bea87982eb15 SHA512 05f6119434754259f19c490d8ba49c9cfd726d3372db99478b13e482af7734749c8ec09de51cb50884ce5a4c465c9a98b478d4278bbf6acb2e2ebccb9ff6a78a

‎cosmic-base/cosmic-applibrary/cosmic-applibrary-1.0.5.ebuild‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

cosmic-base/cosmic-applibrary/cosmic-applibrary-1.0.4.ebuild renamed to cosmic-base/cosmic-applibrary/cosmic-applibrary-1.0.7.ebuild

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,12 @@
33

44
EAPI=8
55

6-
inherit cosmic-de desktop
6+
inherit cosmic-de-r2 desktop
77

88
DESCRIPTION="app library for COSMIC DE"
99
HOMEPAGE="https://github.com/pop-os/cosmic-applibrary"
1010

11-
MY_PV="epoch-1.0.4"
12-
13-
SRC_URI="
14-
https://github.com/pop-os/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${PN}-${PV}.tar.gz
15-
https://github.com/fsvm88/cosmic-overlay/releases/download/${PV}/${P}-crates.tar.zst
16-
"
11+
SRC_URI="https://github.com/fsvm88/cosmic-overlay/releases/download/${PV}/${PN}-${PVR}.full.tar.zst"
1712

1813
# use cargo-license for a more accurate license picture
1914
LICENSE="GPL-3"
@@ -22,11 +17,11 @@ KEYWORDS="~amd64"
2217

2318
src_install() {
2419
# One of the few where $PN does not apply (would be cosmic-applibrary)
25-
dobin "$(cosmic-de_target_dir)/cosmic-app-library"
20+
dobin "$(cosmic-common_target_dir)/cosmic-app-library"
2621

2722
domenu data/com.system76.CosmicAppLibrary.desktop
2823

29-
cosmic-de_install_metainfo data/com.system76.CosmicAppLibrary.metainfo.xml
24+
cosmic-common_install_metainfo data/com.system76.CosmicAppLibrary.metainfo.xml
3025

3126
insinto /usr/share/icons/hicolor/scalable/apps
3227
doins data/icons/com.system76.CosmicAppLibrary.svg

‎cosmic-base/cosmic-bg/Manifest‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
DIST cosmic-bg-1.0.4-crates.tar.zst 28154726 BLAKE2B f3d8677815c74d4ea88f86a90e8f656207d16b62487289e9c3f6812f7805131c0c088bb773dc85a68a999ab2dc4eb1012787d2782aec540b627323b3e6498bde SHA512 2df15a9957fb927b75db573475aa7b8d86bc2fbbbd735a3eb84f45d274cacc3ef0ffec7963581bc1e47ffb9b5bd99fd4659ddfe95a94a3d7114b500b3bfc97fe
2-
DIST cosmic-bg-1.0.4.tar.gz 51807 BLAKE2B b68c945a06b95726c73b3df952c45b59e7ead3e26b2531d2d453ef4259f4a5fd3870529771b0c96fdeeea6eb243e6a374f8cea1deb51e09f974ba3996b84f711 SHA512 73d694cc34a4727a7c20f05e4892053d6c0f89521dcea200db9d89dbc886f6dc27d799401d6150daac261f8c623dc53809cbe0f77905ec67d0e982943fbb3aff
3-
DIST cosmic-bg-1.0.5-crates.tar.zst 28153436 BLAKE2B 9b6c5a0d0f56c99b77ecacf78cc96364eaa7f7e13c01d18283afbb1db57a62d2491e56bb474074bcaff025dae96682847eeb0a85fcd471241c6a0a5b186952c2 SHA512 76d039672600cb4a8cd4753dbbe6b345c91c464ba103cb0b47ac9a5f3868b039bf30c5ecedcaff7e0bd330c8b79df28f04d7121f6713629302fdee66ab999651
4-
DIST cosmic-bg-1.0.5.tar.gz 51850 BLAKE2B b3edaf5396eb94dfd31803f25fb0c02b55be0287cb616999810f3705f5a765b06fbd537c641798d90f701ed266afe59539e17bbfd24d3212161d8c60cd9ea516 SHA512 56d32f568ec422af800948512418f8e2e2c205371fb6b4d94c04e4109c214f7803b9be83f5d40fc5ca7765af6549793f69ba1e0a465dcfa5e82b364194dc6b5b
51
DIST cosmic-bg-1.0.6.full.tar.zst 25681447 BLAKE2B 8ccb522ba15008f13aa7c44671c5a31dc9695199dc0daa31cd09788f2f63e32ae9242b20a76338672920371565d670b59e85cdd30fe4f3f3bbcac8f3e489261c SHA512 2daaa2502a44bd2f2d77f04938110ea07c033385a9fa29e9fc74803c183dc9a9a3ce6fb1ba7adafa1b06adea866aaada2fb057473b993c0dec97fc64a79a56f1
2+
DIST cosmic-bg-1.0.7.full.tar.zst 25682365 BLAKE2B 0a3bf6a08590d6fbcc9ba15d54f444d0d1686c3055714c6f46ed65680952c0e3a0a7be990e8fe475fd0622eced9d4275a382ae2d05af060382af6953502d5492 SHA512 c84cbb96be41d409efaf53590ddf582789ff866e5b19884260c905d300dd0fb0e0b4ae93271370680914a412a59ca1d133371a6debc9807ba8bc00e9b071d22d

‎cosmic-base/cosmic-bg/cosmic-bg-1.0.5.ebuild‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

cosmic-base/cosmic-bg/cosmic-bg-1.0.4.ebuild renamed to cosmic-base/cosmic-bg/cosmic-bg-1.0.7.ebuild

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,24 @@
33

44
EAPI=8
55

6-
inherit cosmic-de desktop
6+
inherit cosmic-de-r2 desktop
77

88
DESCRIPTION="display background service for COSMIC DE"
99
HOMEPAGE="https://github.com/pop-os/cosmic-bg"
1010

11-
MY_PV="epoch-1.0.4"
12-
13-
SRC_URI="
14-
https://github.com/pop-os/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${PN}-${PV}.tar.gz
15-
https://github.com/fsvm88/cosmic-overlay/releases/download/${PV}/${P}-crates.tar.zst
16-
"
11+
SRC_URI="https://github.com/fsvm88/cosmic-overlay/releases/download/${PV}/${PN}-${PVR}.full.tar.zst"
1712

1813
# use cargo-license for a more accurate license picture
1914
LICENSE="MPL-2.0"
2015
SLOT="0"
2116
KEYWORDS="~amd64"
2217

2318
src_install() {
24-
dobin "$(cosmic-de_target_dir)/$PN"
19+
dobin "$(cosmic-common_target_dir)/$PN"
2520

2621
domenu data/com.system76.CosmicBackground.desktop
2722

28-
cosmic-de_install_metainfo data/com.system76.CosmicBackground.metainfo.xml
23+
cosmic-common_install_metainfo data/com.system76.CosmicBackground.metainfo.xml
2924

3025
insinto /usr/share/cosmic/com.system76.CosmicBackground/v1
3126
doins data/v1/*

‎cosmic-base/cosmic-comp/Manifest‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
DIST cosmic-comp-1.0.4-crates.tar.zst 68942288 BLAKE2B 8b8155f75a881ecbc08824d1078fc230db731343f1624d41015ef558f56c45a58835ce172d2916a7495d4533009c1e3bf37c4f108a05336a6f72fb0b6b91294c SHA512 215cea1172cc3de41db98b9850e1e607e824b3903dfc55d1d185f85a4d9f0b848be8d9e2764055c070625b75c0188e42a23570309618a9f8c77a4595338be28f
2-
DIST cosmic-comp-1.0.4.tar.gz 492457 BLAKE2B c9610fc658e9fc623df8c168b0f341b75771a78eed3c0a63d826f892b546c131972c5d98f597f97230b31ec01d965a36c3e96c7bedfeb995ebbbda0e66a418ff SHA512 b3e550656f8c77cd1555b1e85804a1a2886800d4ba2d62954f4e15ca7a244f981a09dd597b43cd41cc706e91d1cf7cafaca41d0d7cfa2ad06e6fc6d6b63c34aa
3-
DIST cosmic-comp-1.0.5-crates.tar.zst 68941798 BLAKE2B 8d73882dde458670db0937ba70970f8afe625fc9dfeac1d8072f33947be437843a786782188d8174660a196b74c9579fbf1ea24fefffb789ef0f9f32e9593678 SHA512 c35e2f465b5b79aab288e192051fce19f05e744af349b352064d99833e69d51d731809d2b8e578ac89f4160665ea2843bd36dc2130cd98b78a28b1f2d8ffcaf1
4-
DIST cosmic-comp-1.0.5.tar.gz 492476 BLAKE2B 2a0875d0a0cbd0b1798cd0419a8ef5b8f6797cf9dfe2a94c15642ca5b59eaf3d5d27d38538ba390384fe6d44e7ac40e32b8884d58b589e3761fe3f612e26e4f2 SHA512 33eb1def2342b9531f5a6ecf79b328ca9570158cd969762bde73137ef0353828cef86a8cd4ba0310c13845524e7657e0e399c63ea2d8f718b625475d0b326423
51
DIST cosmic-comp-1.0.6.full.tar.zst 63095600 BLAKE2B 6ed59f485a7eebf841f93b9b990b821658c95546a8fbde5223ea5e3695399021115506f66d072af3f714031156430bccb15f78973c5b070a7ea3f796e144317d SHA512 53b255785e334a417e8d7b73713a88ec9059aee66be07cdf94d06e46b241e8b8f267dc7f4ba8698318958c6eb0a1f4be0a404702937af70a0564c3b5852e9afc
2+
DIST cosmic-comp-1.0.7.full.tar.zst 63117463 BLAKE2B 16cb672733878b2ff30c82f282b374076c2f2fc403626dbd1dd467a32e9532bef3d0c9f240d430739e11d01e73e4ef09451962e323d09e5a2643529a4500a164 SHA512 1412688ee3dbaf45ce34432ba8efc063f783a4b7045ca598916d622fc26a6805751b6ad62480b97a86716504a5a367e76f03fd0363628d8dea6b11b5e405de15

0 commit comments

Comments
 (0)