From af789e024bd2779dd171934c95833f045f7e4b92 Mon Sep 17 00:00:00 2001 From: John McQuah Date: Fri, 23 Dec 2022 08:54:37 -0500 Subject: [PATCH] libdispatch: clean up Pkgfile --- REPO | 67 +++++++++++++++++++++--------------------- libdispatch/.footprint | 6 ++-- libdispatch/.signature | 6 ++-- libdispatch/Pkgfile | 17 ++++++----- 4 files changed, 49 insertions(+), 47 deletions(-) diff --git a/REPO b/REPO index 499e585..d3f9c05 100644 --- a/REPO +++ b/REPO @@ -94,8 +94,8 @@ f:25ab755226086d18a17cb559b05cf95b:python3-pytimeparse/.footprint f:47d9cf43ba305aa73fa7ffddca0dd4d3:python3-slugify/.signature f:59f77e729dcafef4cc4270a68ccd98a6:python3-slugify/Pkgfile f:d5f558e53da2dddb2f80bde72f94332d:python3-slugify/.footprint -f:1b918a3590477f9b2675342427166c9a:xournalpp/.signature -f:143eab7e51e903fc6b546bca235e1e7c:xournalpp/Pkgfile +f:5a984aa5603b9a174633a58cea4ec43e:xournalpp/.signature +f:4ec8b05be8a281522931a7f84302bfb9:xournalpp/Pkgfile f:276fc4ac025642b34588418a6859271f:xournalpp/.footprint f:b4876d82493de47a71ef1562e613539d:texlive-base/README f:85d9a28badf0967c2b3a29aa5a320e4f:texlive-base/tabu.sty.diff @@ -112,9 +112,9 @@ f:e32702c4d8b0c2fa7ed6964cced33137:python3-agate-excel/.footprint f:0f384b37a1d1a78bb71c28bcf8797663:python3-sqlalchemy/.signature f:391890506ac5d81debb316b191287d23:python3-sqlalchemy/Pkgfile f:663aa2ead16dc3668481502fd192d31e:python3-sqlalchemy/.footprint -f:a01def7341a695fcf5b8c39148784802:sbcl/.signature -f:36e1668b3d530abc946c9f62fa8cf81b:sbcl/Pkgfile -f:16caa516eb07b5f497dd959ea0355f01:sbcl/.footprint +f:1f65c5f5e3ea91b0bde03828fd74cca8:sbcl/.signature +f:f1354fe9ee57471b01f16345f884fa76:sbcl/Pkgfile +f:c0796121b6db3e1c731888b54db9fbc4:sbcl/.footprint f:805e98e8ca6ebfd1cce3459a90b4cd0f:maelstrom/struct-button.patch f:90b704c0368e54b6a53bf71ffb410714:maelstrom/.signature f:884580c8c5c7d844e88e7bff2cb0953a:maelstrom/Pkgfile @@ -130,24 +130,24 @@ f:c1d50dffa63b8b9b704da2922a49aac4:wildmidi/.footprint f:464dbf1dd0e4335360063c8dca1323d8:python3-agate-sql/.signature f:3dcf84e1d49d8d064dc0cf79dce43015:python3-agate-sql/Pkgfile f:b18830074835b32e5a95fb530bc6f5c7:python3-agate-sql/.footprint -f:5880f449a2aab2a3b930962fd5e0ddb3:lagrange/.signature -f:c7880e888365c481b60ea3aea1528cff:lagrange/Pkgfile +f:3ebcb62dcdd7e1d2eaefa5282220240c:lagrange/.signature +f:aebed274a2481a4dc7a3309d82c21602:lagrange/Pkgfile f:82a51d383223bf7fd9b96db8c25d63a9:lagrange/.footprint -f:bf7b89891ec52d3ee6db7a236627f0fa:xxd-standalone/.signature -f:973ed34ae1686b68b9269c47acceaf3a:xxd-standalone/Pkgfile +f:82a26b3077baed37a24277a454b4b593:xxd-standalone/.signature +f:de5d7b62bc9ac9eafddf63361196aec5:xxd-standalone/Pkgfile f:6a56978029c881e1303af69dc05e95fb:xxd-standalone/.footprint -f:ce695ec086d18ba83460e22bf913ffea:bemenu/.signature -f:bd0079b0368eb2d4b7e94d5d6544b9fb:bemenu/Pkgfile -f:ebf58bd2f21cfa05286aec0641841cc0:bemenu/.footprint +f:06775a6c46c9cac1ac4164a3c908a263:bemenu/.signature +f:1081d9e621ac6d2652458be60494ccc5:bemenu/Pkgfile +f:7f401e5f55aae57b88b65b9860cf0268:bemenu/.footprint f:61b34e67cb216db18fe3ebdd82a4f2aa:lbreakouthd/README -f:7ac8e877dea6b9b56b3e1df1847d38aa:lbreakouthd/.signature -f:9f7aa8033b4bd02aa6a1080418415395:lbreakouthd/Pkgfile +f:bb3c96d114f6fb618ccded92ee330fad:lbreakouthd/.signature +f:b1fe78619f20413100be992e3185a3d9:lbreakouthd/Pkgfile f:11dd3bcfa9fdf92e7ab56a40ab95a788:lbreakouthd/.footprint f:d8f351d4fb547859ae62a6aec84e2a2e:xclock/.signature f:63dd2c0915dada0d2d57d4973852e693:xclock/Pkgfile f:9e7fd2d9b0727049d7af602113e27204:xclock/.footprint -f:1c6313760ba70453e9aca45da888de73:wf-recorder/.signature -f:f9f88687396f680c6b68b268b1820470:wf-recorder/Pkgfile +f:edf957f8ad091acdab031091fa3ced27:wf-recorder/.signature +f:08a2264ba2da3b822427aedc03d5b5a7:wf-recorder/Pkgfile f:a73c76b58ce320bdc2c96e10e6bea7e6:wf-recorder/.footprint f:10b50cfbf1226ea608207ac5447a2818:moonlander/.signature f:3a087768002a4364ae7e00f439185c03:moonlander/Pkgfile @@ -155,9 +155,8 @@ f:c0e40342786a8145871e648dea7dd774:moonlander/.footprint f:b805ec30f0bf5689ff06a08168726c0f:fortune-mod/.signature f:017679266fb4234007ea9068a755a6a1:fortune-mod/Pkgfile f:ec97a379952ab64db4f9ec2963df540f:fortune-mod/.footprint -f:56760e4171ce7f972e9bc895109c4b4c:ncdu/.signature -f:1741189bf6b0ad05369c079c85c6492c:ncdu/Pkgfile -f:e9fd08791d6b05ab8b85628c42bb0f70:ncdu/ncdu.1 +f:dcf2aacf2f920c82065d8ad69a5dc5a1:ncdu/.signature +f:b24e9760dfcf2db4973ff704ef46cc1e:ncdu/Pkgfile f:3765586fe37e9002a781bae8f35a9bc6:ncdu/.footprint f:3647bf31ba5888ab5c8693305de43678:deadbeef/README f:6536f87cbb8aee85e2d07340053906c7:deadbeef/.signature @@ -176,12 +175,12 @@ f:3445d3ed267a374ebf6a2528bfc68b06:python3-pyicu/.footprint f:4cf6da2bb379c9ab10ece5972d8e091e:libtimidity/.signature f:272da831d37b45f618c7deeadc086d15:libtimidity/Pkgfile f:5fe4beb88a8acd63b4b235f5a0c019d2:libtimidity/.footprint -f:33bf94b9a33042a65775f6016b156278:zathura-ps/.signature -f:eb92c152208ac2f3183669431823ede1:zathura-ps/Pkgfile +f:a6245b9017406d3b07a58b6765c710f8:zathura-ps/.signature +f:7ffbefb227176f1b8d5c0a7fe6efa212:zathura-ps/Pkgfile f:dc946177c3e1057591b8951b35cefb57:zathura-ps/.footprint -f:220460378423d647281086776be5804a:sfwbar/.signature -f:70e3e3f420c1e0feab851a2f52941853:sfwbar/Pkgfile -f:50d458c86518d52774b250adfab8269c:sfwbar/.footprint +f:5bca29a738a25c9453956e09054efe89:sfwbar/.signature +f:49459c8a1a5052785d6cea53d119a69f:sfwbar/Pkgfile +f:04934348b41b3c865dfd03036522d429:sfwbar/.footprint f:62b29c353146c16655ad788c14677762:sundials/sundials-fix-cmake-targets.patch f:5d5d948027c591547dd0e979a225d62f:sundials/.signature f:c65b00832be395eb095ee3b6e5f950e6:sundials/Pkgfile @@ -189,8 +188,8 @@ f:f86b14e4d133448fc0b537dba6acc349:sundials/.footprint f:c00ff4c3294d7ddeed77909e3f346cc6:recode/.signature f:cbdfc8fb2f6adaea62aea33a99072d28:recode/Pkgfile f:40a8f2b33a82a6a525e3ad56b7ebf93f:recode/.footprint -f:c82af83e5c61e8bcc9ea822cb235f9d2:zathura-pdf-poppler/.signature -f:d7f494a465624b395168054be1feaa09:zathura-pdf-poppler/Pkgfile +f:39680318d83f51fa90fd16fa4ed05154:zathura-pdf-poppler/.signature +f:13d8d971c19328457beb3c9af2788a94:zathura-pdf-poppler/Pkgfile f:3961411333908c5200c5ba74f8240798:zathura-pdf-poppler/.footprint f:74e453d9399191d49fb6acb51d70694a:libfreeimage-lite/.signature f:c4a660d93a260478a5f4d246be1c260d:libfreeimage-lite/Pkgfile @@ -256,9 +255,9 @@ f:bfe7fbd983f027324d35232f9ee3957a:qrupdate/.signature f:c694ab87078e117980534457a9e0d47d:qrupdate/Pkgfile f:dcc79f672da9a4a920698929afd6bbe6:qrupdate/.footprint f:94969eacaafabc11144cc76e1df1906e:qrupdate/r32-drop-awk.patch -f:b9289c0f082ce57bf6ca17a5ebf7a929:libdispatch/.signature -f:ebe664b47eb9122834ea2fa6b689429b:libdispatch/Pkgfile -f:91c90e9011811a83678754fccc88911f:libdispatch/.footprint +f:e61fbe884b054717206d9ac496a632a8:libdispatch/.signature +f:abb98c9574e644969d1816b94acfb5c8:libdispatch/Pkgfile +f:9fe9d7ffb6b528962d781a93fa78c0ac:libdispatch/.footprint f:ed2f734c1a44536db3f243a11e6ab0d9:libdazzle/.signature f:999feaf7303f6004af151e94b484f0b5:libdazzle/Pkgfile f:9bccb60649d49193e2a52376d41ffba4:libdazzle/.footprint @@ -299,8 +298,8 @@ f:67cd7486323e555290985505f26e3368:oksh/.signature f:1d3c472bfac073ee9103b7d7cbadaae9:oksh/Pkgfile f:d75610ef197b7420248d913c319b1d5c:oksh/post-install f:abd630e4c2fca1c82f3ab82628e761a1:oksh/.footprint -f:dbce5a2fd52e39aefb5855258ca642c5:cagebreak/.signature -f:b2f8d16caea89451939a00b700415ecf:cagebreak/Pkgfile +f:c8650e5495a1eae8cb2749cb1e0809f1:cagebreak/.signature +f:4c15e7098ed2d735b14334fd1b58f839:cagebreak/Pkgfile f:e0f3905fa3c1a067ba576932711d21a4:cagebreak/.footprint f:10a047cd0a37146281b4a5a55083f760:tagutil/.signature f:5d28fd4029aa7d681486c6920a0cc82b:tagutil/Pkgfile @@ -315,6 +314,6 @@ f:64299ab187bec0a272fd484cba5ae45e:python3-et_xmlfile/.signature f:3b903a744ae49ea8ba2295ee91e0da3b:python3-et_xmlfile/Pkgfile f:71cb950baaf9fc91d3c4c7a86ef2bd25:python3-et_xmlfile/.footprint f:97dbd27198bc704dd2416425f082bbf6:imv/freeimagelite.patch -f:f2003b2a3e42fc7eabbfc5a2a156ed2e:imv/.signature -f:f562b8b2cedcb661f01bbc0070cf0944:imv/Pkgfile -f:0bf314c5c9b2ce59cf3f07c40e1baf8c:imv/.footprint +f:8750753726c1a5a75c500de93662a6ef:imv/.signature +f:5eee3e30d4ca3c5757ba81b33ac511c5:imv/Pkgfile +f:a82e6203dc1db7951ee89ee70d87b2be:imv/.footprint diff --git a/libdispatch/.footprint b/libdispatch/.footprint index b0b2ffb..5c4d4c6 100644 --- a/libdispatch/.footprint +++ b/libdispatch/.footprint @@ -19,9 +19,9 @@ drwxr-xr-x root/root usr/include/os/ -rw-r--r-- root/root usr/include/os/generic_unix_base.h -rw-r--r-- root/root usr/include/os/generic_win_base.h -rw-r--r-- root/root usr/include/os/object.h -drwxr-xr-x root/root usr/lib64/ --rwxr-xr-x root/root usr/lib64/libBlocksRuntime.so --rwxr-xr-x root/root usr/lib64/libdispatch.so +drwxr-xr-x root/root usr/lib/ +-rwxr-xr-x root/root usr/lib/libBlocksRuntime.so +-rwxr-xr-x root/root usr/lib/libdispatch.so drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man3/ diff --git a/libdispatch/.signature b/libdispatch/.signature index 59dc0a5..3d9a2e6 100644 --- a/libdispatch/.signature +++ b/libdispatch/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/jmq.pub -RWTTPlFarK9CxFtx7/iJDMEKYqWMHteQ/lnGOPFydVT9ox9f3hM5erBRFSP2oNd5I04dZZoBiCXjaNkLsZQaC/3XbMJSeZuvwwk= -SHA256 (Pkgfile) = a52f24cf1ce83006db6652c4ef2428a7a92a89c86c4fca3207af728f3732fcc9 -SHA256 (.footprint) = 287db7106b2b2971695b1d3c048caf00d307c14a923e3e36f1c7e0f96d3f6057 +RWTTPlFarK9CxLMtOCYTEjPDconlv2MqX0mmD1CV5EYqbzzFq7sg5OtNnF6KckVo31p7pVaP1lqCOnxiX5DHFKq3MfRCa9A6SgY= +SHA256 (Pkgfile) = 71ed274ab2dc1cc662bd902f7b2a6bf3adbc3afafc4b470e3a4709c1bbff2c62 +SHA256 (.footprint) = b71c22b91f41313aa5e8ced9cd9573d368694f99e7c76b9cdb0f921694b7d8b5 SHA256 (swift-5.5.3-RELEASE.zip) = 03f174c8677f50707bdb5c4606159f6216c0db4eb11969137fde83bdab166b05 diff --git a/libdispatch/Pkgfile b/libdispatch/Pkgfile index b0ef13d..c4723e9 100644 --- a/libdispatch/Pkgfile +++ b/libdispatch/Pkgfile @@ -10,14 +10,17 @@ source=(https://github.com/apple/swift-corelibs-$name/archive/refs/tags/swift-$v build() { find swift-corelibs-* -name DispatchCompilerWarnings.cmake \ - -exec sed -i "/-Werror/d" '{}' \; + -exec sed -i "/-Werror/d" '{}' \; mkdir build && cd build - cmake -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBlocksRuntime_INCLUDE_DIR=/usr/include \ - -DCMAKE_BUILD_WITH_INSTALL_RPATH=on ../swift-corelibs-$name-* - ninja + cmake -G Ninja -DCMAKE_C_COMPILER=clang \ + -DCMAKE_CXX_COMPILER=clang++ \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBlocksRuntime_INCLUDE_DIR=/usr/include \ + -DCMAKE_BUILD_WITH_INSTALL_RPATH=on \ + ../swift-corelibs-$name-* + ninja -j ${JOBS:-1} DESTDIR=$PKG ninja install }