diff --git a/common/shlibs b/common/shlibs index a5ebf1e4f26..73b30da49dd 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1021,7 +1021,7 @@ libsbc.so.1 sbc-1.0_1 libecryptfs.so.1 libecryptfs-104_1 libnuma.so.1 libnuma-2.0.7_1 libxar.so.1 xar-1.5.2_1 -libqpdf.so.17 libqpdf-6.0.0_1 +libqpdf.so.18 libqpdf-7.0.0_1 libpolkit-qt-core-1.so.1 polkit-qt-0.103.0_1 libpolkit-qt-gui-1.so.1 polkit-qt-0.112_3 libpolkit-qt-agent-1.so.1 polkit-qt-0.103.0_1 @@ -1135,7 +1135,7 @@ libprotobuf-vala.so.0 libprotobuf-vala-0.1.0_1 librlog.so.5 librlog-1.4_1 libtinyxml.so.0 tinyxml-2.6.2_1 libbluray.so.2 libbluray-1.0.0_1 -libnfs.so.8 libnfs-1.9.7_1 +libnfs.so.11 libnfs-2.0.0_1 libzip.so.5 libzip-1.2_1 libapp.so.0 libapp-20110513_1 libluajit-5.1.so.2 LuaJIT-2.0.0_1 @@ -1612,10 +1612,10 @@ libvtv.so.0 libvtv-6.3.0_1 libatomic.so.1 libatomic-4.9.0_1 libpcsclite.so.1 libpcsclite-1.8.11_1 libpcscspy.so.0 libpcsclite-1.8.11_1 -libBulletDynamics.so.2.83 bullet-2.83.5_1 -libBulletCollision.so.2.83 bullet-2.83.5_1 -libLinearMath.so.2.83 bullet-2.83.5_1 -libBulletSoftBody.so.2.83 bullet-2.83.5_1 +libBulletDynamics.so.2.86 bullet-2.86.1_1 +libBulletCollision.so.2.86 bullet-2.86.1_1 +libLinearMath.so.2.86 bullet-2.86.1_1 +libBulletSoftBody.so.2.86 bullet-2.86.1_1 libinotifytools.so.0 libinotify-tools-3.14_2 libopensc.so.5 libopensc-0.17.0_1 libsmm-local.so.5 libopensc-0.17.0_1 @@ -2003,7 +2003,7 @@ libcvm-v1client.so.1 cvm-0.97_1 libcvm-v2client.so.1 cvm-0.97_1 libudns.so.0 udns-0.4_1 libcriu.so.1 criu-1.5.1_2 -libwebsockets.so.11 libwebsockets-2.3.0_1 +libwebsockets.so.12 libwebsockets-2.4.0_1 libbitcoinconsensus.so.0 litecoin-0.10.1.2_1 libnfc.so.0 libnfc-1.7.1_1 libfuzzy.so.2 libfuzzy-2.12_1 @@ -2311,7 +2311,7 @@ libmill.so.18 libmill-1.14_1 libges-1.0.so.0 gst1-editing-services-1.6.2_1 libykneomgr.so.0 libykneomgr-0.1.8_1 libopenshot-audio.so.5 libopenshot-audio-0.1.4_1 -libopenshot.so.12 libopenshot-0.1.7_1 +libopenshot.so.13 libopenshot-0.1.8_1 libpqxx-4.0.so libpqxx-4.0.1_1 libndpi.so.1 ndpi-1.6_1 liblog4cxx.so.10 log4cxx-0.10.0_1 @@ -2750,13 +2750,14 @@ libspectrum.so.8 libspectrum-1.2.2_1 libbearssl.so.0 bearssl-0.3_1 libXfont2.so.2 libXfont2-2.0.1_1 libqalculate.so.12 libqalculate-2.1.0_1 -libweston-2.so.0 weston-2.0.0_1 +libqalculate.so.11 libqalculate-2.0.0_1 +libweston-3.so.0 weston-3.0.0_1 +libweston-desktop-3.so.0 weston-3.0.0_1 libmutter-0.so.0 mutter-3.24.0_1 libmutter-clutter-0.so mutter-3.24.0_1 libmutter-cogl-path-0.so mutter-3.24.0_1 libmutter-cogl-0.so mutter-3.24.0_1 libmutter-cogl-pango-0.so mutter-3.24.0_1 -libmozjs-38.so mozjs38-38.8.0_4 libostree-1.so.1 libostree-2017.3_1 librhash.so.0 rhash-1.3.4_1 libserialport.so.0 libserialport-0.1.1_1 @@ -2775,11 +2776,17 @@ libPocoXML.so.48 poco-1.7.8p2_1 libPocoUtil.so.48 poco-1.7.8p2_1 libopenblas.so.0 openblas-0.2.19_1 librtmidi.so.4 rtmidi-3.0.0_1 -libbac-7.4.7.so bacula-common-7.4.7_1 -libbaccfg-7.4.7.so bacula-common-7.4.7_1 -libbacfind-7.4.7.so bacula-common-7.4.7_1 -libbacsql-7.4.7.so bacula-common-7.4.7_1 -libbaccats-7.4.7.so bacula-common-7.4.7_1 +libbac-9.0.4.so bacula-common-9.0.4_1 +libbaccfg-9.0.4.so bacula-common-9.0.4_1 +libbacfind-9.0.4.so bacula-common-9.0.4_1 +libbacsql-9.0.4.so bacula-common-9.0.4_1 +libbaccats-9.0.4.so bacula-common-9.0.4_1 +libbacsd-9.0.4.so bacula-common-9.0.4_1 +libbaccats-mysql-9.0.4.so bacula-common-9.0.4_1 +libbaccats-sqlite3-9.0.4.so bacula-common-9.0.4_1 +libbaccats-postgresql-9.0.4.so bacula-common-postgresql-9.0.4_1 +libbaccats-mysql-9.0.4.so bacula-common-mariadb-9.0.4_1 +bpipe-fd.so bacula-fd-9.0.4_1 libsuperlu.so.5 superlu-5.2.1_1 libgosu.so.0 gosu-0.12.0_1 libyara.so.3 libyara-3.5.0_1 @@ -2872,3 +2879,9 @@ libvala-0.38.so.0 libvala-0.38.1_1 libvaladoc-0.38.so.0 libvala-0.38.1_1 libphodav-2.0.so.0 phodav-2.2_1 libgfshare.so.2 libgfshare-2.0.0_1 +libtracker-miner-2.0.so.0 libtracker-2.0.1_1 +libtacacs.so.1 tacacs-4.0.4.28_1 +libffms2.so.4 libffms2-2.23.1_1 +libduktape.so.201 duktape-2.1.1_1 +liblsmash.so.2 liblsmash-2.9.1_1 +libgnustep-base.so.1.25 gnustep-base-1.25.0_1 diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh index 411537973d6..b02b6e3b029 100644 --- a/common/xbps-src/shutils/chroot.sh +++ b/common/xbps-src/shutils/chroot.sh @@ -118,6 +118,8 @@ chroot_sync_repos() { local f= # Copy xbps configuration files to the masterdir. + install -Dm644 ${XBPS_DISTDIR}/etc/xbps.conf \ + ${XBPS_MASTERDIR}/etc/xbps.d/00-xbps-src.conf install -Dm644 ${XBPS_DISTDIR}/etc/repos-local.conf \ ${XBPS_MASTERDIR}/etc/xbps.d/10-repository-local.conf install -Dm644 ${XBPS_DISTDIR}/etc/repos-remote.conf \ diff --git a/etc/xbps.conf b/etc/xbps.conf new file mode 100644 index 00000000000..3b1211fbc65 --- /dev/null +++ b/etc/xbps.conf @@ -0,0 +1 @@ +syslog=false diff --git a/srcpkgs/2048-qt/template b/srcpkgs/2048-qt/template index e944339bb8a..71f3ee371a2 100644 --- a/srcpkgs/2048-qt/template +++ b/srcpkgs/2048-qt/template @@ -1,6 +1,6 @@ # Template file for '2048-qt' pkgname=2048-qt -version=0.1.5 +version=0.1.6 revision=1 build_style=qmake hostmakedepends="qt5-declarative-devel" @@ -11,22 +11,22 @@ short_desc="The 2048 game implemented in Qt" homepage="https://github.com/xiaoyong/2048-Qt" license="MIT" distfiles="https://github.com/xiaoyong/2048-Qt/archive/v${version}.tar.gz" -checksum=b895ecdbc09127215baf2633b513726cb39e24f22cc309ec390ac9bdae9b224c +checksum=994b472d9798ebcae6b5e5a733f175f0278ab9f2f6cde1511a08335899e8f892 wrksrc="2048-Qt-${version}" do_install() { vbin 2048-qt for size in 16 32 48 256; do - vinstall icons/${size}x${size}/apps/2048-qt.png 644 usr/share/icons/hicolor/${size}x${size}/apps + vinstall res/icons/${size}x${size}/apps/2048-qt.png 644 usr/share/icons/hicolor/${size}x${size}/apps done - vinstall icons/scalable/apps/2048-qt.svg 644 usr/share/icons/hicolor/scalable/apps + vinstall res/icons/scalable/apps/2048-qt.svg 644 usr/share/icons/hicolor/scalable/apps vlicense LICENSE - vinstall 2048-qt.desktop 644 usr/share/applications + vinstall res/2048-qt.desktop 644 usr/share/applications vdoc README.md vdoc Changelog.md - vman man/2048-qt.6 + vman res/man/2048-qt.6 } diff --git a/srcpkgs/Adapta/template b/srcpkgs/Adapta/template index a6adaf23642..d29f75f6934 100644 --- a/srcpkgs/Adapta/template +++ b/srcpkgs/Adapta/template @@ -1,6 +1,6 @@ # Template file for 'Adapta' pkgname=Adapta -version=3.91.2.238 +version=3.92.1.4 revision=1 build_style=gnu-configure wrksrc="adapta-gtk-theme-$version" @@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni " license="GPL-2" homepage=https://github.com/adapta-project/adapta-gtk-theme distfiles="https://github.com/adapta-project/adapta-gtk-theme/archive/$version.tar.gz" -checksum=d3fb93634667c33902c986bc4fdd9ce30c9d3e37355c39abe901f3675b156ea2 +checksum=27c248dc0480a47c5da721826262535fd792458686713ac7a0326e12cdb3e3aa noarch=y diff --git a/srcpkgs/Bear/patches/0001-fix-xlocale_h.patch b/srcpkgs/Bear/patches/0001-fix-xlocale_h.patch deleted file mode 100644 index 9eda4517451..00000000000 --- a/srcpkgs/Bear/patches/0001-fix-xlocale_h.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libear/ear.c -+++ libear/ear.c -@@ -39,7 +39,6 @@ - #include - #include - #include --#include - #include - #include - #include diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template index a5c12335169..774fe29a676 100644 --- a/srcpkgs/Bear/template +++ b/srcpkgs/Bear/template @@ -1,6 +1,6 @@ # Template file for 'Bear' pkgname=Bear -version=2.3.7 +version=2.3.8 revision=1 build_style=cmake depends="python" @@ -9,4 +9,4 @@ maintainer="Alain Kalker " license="GPL-3" homepage="https://github.com/rizsotto/Bear" distfiles="https://github.com/rizsotto/Bear/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=dfb6bc97eb868ff583ffd737d4873eaa6a1f8d47543694f6a696c9581a20dfad +checksum=1c0ea23e5ef05eb8113cffd8da345dc82e91d0318488606cd7d5ca974842b81b diff --git a/srcpkgs/CopyAgent/files/TERMS b/srcpkgs/CopyAgent/files/TERMS deleted file mode 100644 index 1a80bbce87f..00000000000 --- a/srcpkgs/CopyAgent/files/TERMS +++ /dev/null @@ -1,144 +0,0 @@ -Barracuda Networks Terms of Service -Last Modified: February 2013 - -The Copy Terms of Service (the "Terms" or "Agreement") is a legal agreement between you, either an individual or a single legal entity ("You" or "you" or "Your" or "your"), and Barracuda Networks, Inc. for the Copy service ("Copy" or "Product" or "we" or "our"). These Terms govern your use of Copy, including any updates and accompanying written documentation. - -Your use of the Copy constitutes your binding legal agreement to these Terms, which are subject to change at any time by Barracuda Networks. If you are not legally able to be bound by these Terms, your use of Copy is prohibited. - -You acknowledge and agree that Copy may occasionally contact you via email. Please refer to Copy’s Privacy Policy, (https://www.copy.com/about/privacy) for information about how we use, transfer and share information we collect and you store within Copy. - -Your Data and Privacy - -When you use the Product, you agree that Copy may duplicate and store your data, information, files and folders in accordance with Copy’s policies and these Terms. As between You and Copy, all information You provide to Copy remains your property. - -We may also need to share your data, information, files and folders with third parties who assist us in providing the service. You hereby consent to such sharing. In addition, Copy may contain links to third party websites or resources. Your use of the third party materials is governed by their terms and not this Agreement. We are not responsible for or endorse these third parties. - -You are responsible for maintaining and protecting your data in Copy and Copy is not responsible for any loss or corruption to your files or information or for backing up such information. - -Copy is not intended for use by persons under the age of 13 years old. By accepting these terms you represent that you are at least 13 years old. - -Accounts, Passwords and Security - -You must be a registered user to access the Product. Individual users must register using their name and entity users must register under the legal name of their entity. You are responsible for keeping your password private and secure, and are prohibited from sharing your login and password with others. You will be solely responsible and liable for any activity that occurs under your user name. - -Acceptable Use and Conduct - -You are solely responsible for your conduct and your data content uploaded or otherwise placed into Copy. We are not responsible for the legality and appropriateness of information in Copy which you may be able to access or view through your use. You agree to indemnify, defend, and hold harmless Copy and its suppliers from any and all loss, cost, liability, and expense arising from or related to your data, your use of the Products, or your violation of these terms. - -The Products are made available to you only for your personal or internal business use, which use must be in compliance with all applicable Copy policies, laws, rules and regulations and must not infringe or violate third party rights. You may not make commercial use of the Products, including but not limited to selling, licensing, providing services, or distributing the Products to any third party. - -Any unauthorized use of any Copy computer system is a violation of these Terms and may also violate certain federal and state laws. Such violations may subject the unauthorized user and his or her agents to civil and criminal penalties. Copy may immediate remove any content or data, or suspend or cancel accounts if it becomes aware of any misuse or illegal actions associated with an account or user, without prior notice to You. - -You must use Copy responsibly and in a way not interfere with the use, privacy or rights of others. When using Copy, you must not, and must not attempt to, use the services to do any of the following things. - -copy or upload files or information unless you have a legal right to the files or information -probe, scan, or test the vulnerability of any system, or attempt to circumvent any security or authentication measures; -access, tamper with, or use non-public areas of Copy or attempt to access or search Copy through nonpublic interfaces -attempt to disrupt any user or network by sending a virus, malware, overloading, flooding, spamming, or mail-bombing -send unsolicited communications, promotions or advertisements, or spam; -send altered, deceptive or false source-identifying information, including "spoofing" or "phishing"; -publish anything that is fraudulent, misleading, or infringes another's rights misrepresent yourself or affiliation with an entity; -publish or share materials that are offensive, defamatory, or unlawfully; -Changes Copy Products and Terms - -Copy reserves the right at any time to modify, suspend, or discontinue providing the Product or any part thereof in its sole discretion with or without notice. - -Copy reserves the right at any time to modify these Terms in its sole discretion, without liability to you. This Agreement, as amended, will be effective upon use of the Copy Products for all existing users immediately after posting of any amended terms on the Copy.com website. You agree to be bound by this Agreement, as modified. If you do not agree to any changes to the Terms, you must stop using Copy and terminate your account immediately. - -Please review the most current version of this Agreement from time to time, located at https://www.copy.com/policies (or such successor URL as Copy may provide), so that you will be apprised of any changes. - -License to Copy - -Subject to the terms and conditions of this Agreement, Copy grants you a non-exclusive, non- transferable, non-sublicensable limited and revocable license to use the Product (including but not limited to the client software) and to use the Copy Products for the sole and exclusive purposes of your personal or internal business purposes. Certain third party code may be provided with, or contained in, the Product. The third-party license terms accompanying such code, and not the terms of this Agreement, will govern your use of such code. Copy reserves all other rights to its Products. - -The Products and their structure, organization, source code, and documentation contain valuable trade secrets of Copy and its licensors, and accordingly you agree not to (and agree not to allow third parties to) (1) sublicense, transfer, or distribute any aspect of the Products or any derivative thereof to any third party, (2) modify, adapt, translate, or prepare derivative works from the Product, (3) decompile, reverse engineer, disassemble or otherwise attempt to derive source code from the Product, (4) extract portions of the software’s files for use in other applications, or (5) remove, obscure, or alter Copy’s or any third party’s trademarks or copyright or other proprietary rights notices affixed to or contained within or accessed in conjunction with or through the Products. - -Renewals - -You agree that Copy shall have the right to automatically and without notice renew your license to continue to use the Products upon expiration of your license period.. You agree that if you elect to not permit Copy the right to automatically renew your license to use the Products or maintain your credit card information on file, then Copy may terminate your license. - -Intellectual Property - -You acknowledge that Copy or third parties own all right, title and interest in and to the computer source code related to the Product, portions thereof, or software or content provided through or in conjunction with the Product, including without limitation all intellectual property rights. Except for the license granted in this Section, all rights in and to the Products are reserved, and no implied licenses are granted by Copy. - -If you have comments on the Products or ideas on how to improve them, please visit http://copy.com/feedback. Please note that by doing so, you also grant Copy a perpetual, fully paid, royalty-free, irrevocable, transferable license, with right of sublicense, to use and incorporate your ideas or comments into the Products (or third party software, content, or services), and to otherwise exploit your ideas and comments, in each case without further compensation. - -Copyright - -When using Copy, you must respect the intellectual property rights of others. We will respond to any notice of alleged copyright infringement if they comply with the law and are properly reported to use through our DMCA process (https://www.copy.com/about/dmca). We reserve the right to delete or disable content alleged to infringe and our designated agent for alleged infringement is: - -Copyright Agent -Barracuda Networks, Inc. -3175 S. Winchester Blvd -Campbell, CA 95007 -copyright@barracuda.com - -Pricing Terms and Conditions - -Upgraded Accounts - -Copy offers you the option of increasing your account storage space beyond 5 GB for a fee. By doing so, your account will be converted to a Premium Account and will not be subject to some of the restrictions placed on Free Accounts as described below. - -Copy accepts credit cards and will automatically charge your credit card monthly or yearly, depending upon which Premium Account you select. If any fee is not paid in a timely manner, or Copy is unable to process your transaction using the credit card information provided, Copy reserves the right to revoke access to your Copy account and reserves the right to use our discretion to delete some or all of Your data so as to reduce your storage space to below 2 GB, and to convert your Premium Account to a Free Account (which is subject to the restrictions described below). - -Billing - -The fees for your Upgraded Account will be billed from the date you elect, or convert to, a Upgraded Account and on each monthly or yearly renewal thereafter unless and until you cancel your account. Click on the link on your "Account" page to see the commencement date for your next renewal period. Copy will automatically bill your credit card each month or year on the anniversary of the commencement of your Upgraded Account. You acknowledge that the amount billed each month or year may vary for reasons that include, differing amounts due to promotional offers, differing amounts due to changes in your account, or changes in the amount of applicable sales tax, and you authorize us to charge your credit card for such varying amounts. Copy may also periodically authorize your credit card in anticipation of account or related charges. All fees and charges are noncancelable and nonrefundable and no credits will be given for partially used periods. - -Should you elect to increase your Upgraded Account to a larger amount of storage space, the commencement date for your next renewal period will be reset and you will be billed for the first month or year of the upgraded level of service on a pro-rata basis. - -Copy may change the fees and charges in effect, or add new fees and charges from time to time, but we will give you advance notice of these changes by email or on the website. If you want to use a different credit card or if there is a change in your credit card validity or expiration date, you may edit your information by accessing your "Account" page. It is your responsibility to keep your contact information and payment information current and updated. - -Cancelling Your Account - -Your Copy Upgraded Account will continue in effect unless and until you cancel your Upgraded Account or we terminate it. You must cancel your Upgraded Account before it renews each month or year in order to avoid billing of the next month's or year's fees to your credit card. Copy will bill the monthly or yearly fees associated with your Upgraded Account plus any applicable tax to the credit card you provide to us. - -You may cancel your Copy Upgraded Account at any time, and cancellation will be effective immediately. If you wish to cancel your Upgraded Account you may do so via your "Account" page. Should you elect to cancel your Upgraded Account, please note that you will not be issued a refund for the most recently (or any previously) charged monthly or annual fees. - -By signing up for a Copy Upgraded Account and providing Copy with your payment account information, you hereby agree to these payment terms and conditions. - -Free Accounts - -Copy allows you to store up to 2 GB free of charge. Copy reserves the right to change the amount of free storage or terminate Free Accounts at any time, with or without notice. Without limiting the generality of the foregoing, if a Free Account is inactive for ninety (90) days, then Copy may delete any or all of Your Files without providing additional notice. - -Term and Termination - -This Agreement is effective upon any use and remains in effect until your account is terminated. Terms which by their nature extend beyond termination shall survive termination of this Agreement. - -Your right to use Copy automatically terminates if you fail to comply with these Terms. Copy reserves the right to refuse or discontinue participation to any user at any time at its sole discretion. You agree that, upon such termination, you will discontinue all use of the Products and that your access rights will immediately terminate. - -If this Agreement terminates, other than for your failure to comply, Copy will use commercially reasonable efforts to make your Data available for you by request only for a period of fifteen (15) calendar days. Copy has no obligation to provide you with a copy of your Data and may remove and discard any Data. - -Disclaimer of Warranties - -THE PRODUCTS AND ANY THIRD PARTY SOFTWARE AND SERVICES ARE PROVIDED "AS IS," WITH NO WARRANTIES WHATSOEVER. COPY AND SUCH THIRD PARTIES EXPRESSLY DISCLAIM TO THE FULLEST EXTENT PERMITTED BY LAW ALL EXPRESS, IMPLIED, AND STATUTORY WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, AND NON-INFRINGEMENT OF PROPRIETARY RIGHTS AND ANY WARRANTIES REGARDING THE SECURITY, RELIABILITY, TIMELINESS, AND PERFORMANCE OF THE PRODUCTS, SOFTWARE AND SERVICE AND SUCH THIRD PARTY SOFTWARE OR SERVICES. - -YOU UNDERSTAND AND AGREE THAT YOU USE THE PRODUCT, AND ALL THIRD PARTY SOFTWARE OR SERVICES MADE AVAILABLE IN CONJUNCTION WITH OR THROUGH THE PRODUCT, AT YOUR OWN DISCRETION AND RISK AND THAT YOU WILL BE SOLELY RESPONSIBLE FOR ANY DAMAGES TO YOUR COMPUTER SYSTEM OR LOSS OF DATA THAT RESULTS FROM THE USE OF THE PRODUCT AND SUCH THIRD PARTY SOFTWARE AND SERVICES. - -SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, AND WHERE THAT IS IN EFFECT, THE ABOVE EXCLUSIONS MAY NOT APPLY TO YOU. - -Limitation of Liability - -UNDER NO CIRCUMSTANCES SHALL COPY, OR ITS SUPPLIERS, RESELLERS, PARTNERS OR THEIR RESPECTIVE AFFILIATES BE LIABLE FOR ANY INDIRECT, INCIDENTAL, CONSEQUENTIAL, SPECIAL, EXEMPLARY, OR PUNITIVE DAMAGES ARISING FROM OR RELATED TO THE PRODUCT, WHETHER SUCH CLAIM IS BASED ON WARRANTY, CONTRACT, TORT (INCLUDING NEGLIGENCE), OR OTHERWISE, (EVEN IF COPY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES). - -WITHOUT LIMITING THE FOREGOING, THE TOTAL AGGREGATE LIABILITY OF COPY, AND ITS SUPPLIERS, RESELLERS, PARTNERS AND THEIR RESPECTIVE AFFILIATES ARISING FROM OR RELATED TO THIS AGREEMENT SHALL NOT EXCEED (i) US$25 IF NO AMOUNTS HAVE BEEN PAID BY YOU TO COPYOR (ii) THE AMOUTN PAID BY YOU FOR COPY IN THE THREE MONTH PERIOD IMMEDIATELY PRIOR TO THE CLAIM. - -THE FOREGOING LIMITATIONS OF LIABILITY SHALL APPLY WHETHER THE DAMAGES ARISE FROM USE OR MISUSE OF AND RELIANCE ON THE PRODUCT, FROM INABILITY TO USE THE PRODUCT, OR FROM THE INTERRUPTION, SUSPENSION, OR TERMINATION OF THE PRODUCT (INCLUDING SUCH DAMAGES INCURRED BY THIRD PARTIES). SUCH LIMITATION SHALL APPLY NOTWITHSTANDING A FAILURE OF ESSENTIAL PURPOSE OF ANY LIMITED REMEDY AND TO THE FULLEST EXTENT PERMITTED BY LAW. - -SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF LIABILITY FOR DEATH OR BODILY INJURY OR THE LIMITATIONS ABOVE AND IN THOSE JURISDICTIONS THE ABOVE LIMITATIONS AND EXCLUSIONS MAY NOT APPLY TO YOU. - -Export Restrictions - -You acknowledge and agree that the Product which is the subject of this Agreement, may be controlled for export purposes. You agree to comply with all United States export laws and regulations. You assume sole responsibility for any required export approval and/or licenses and all related costs and for the violation of any United States export law or regulation. If you are located in a country subject to embargo by the United States government, you are not entitled to use Copy. - -Governing Law, Dispute Resolution, and Venue - -THESE TERMS AND THE USE OF THE PRODUCT AND SOFTWARE WILL BE GOVERNED BY CALIFORNIA LAW EXCEPT FOR ITS CONFLICTS OF LAWS PRINCIPLES. ALL CLAIMS ARISING OUT OF OR RELATING TO THESE TERMS OR THE PRODUCT OR SOFTWARE MUST BE LITIGATED EXCLUSIVELY IN THE FEDERAL OR STATE COURTS OF SAN CLARA COUNTY, CALIFORNIA, AND BOTH PARTIES CONSENT TO VENUE AND PERSONAL JURISDICTION THERE. - -If a provision is found unenforceable the remaining provisions of the Agreement will remain in full effect and an enforceable term will be substituted which as closely as possible reflects Barracuda Networks intent. - -Entire Agreement and Assignment - -This Agreement, which incorporates the Barracuda Networks Copy Privacy Policy, constitutes the entire agreement between the parties with respect to the subject matter hereof and supersedes and replaces all prior or contemporaneous understandings or agreements, written or oral, regarding the Products. Barracuda Networks’ failure to enforce a provision is not a waiver of its right to do so later Any waiver of any provision of this Agreement will be effective only if in writing and signed by Barracuda Networks - -You may not assign or transfer any of your rights or obligations under this Agreement. Barracuda Networks may freely assign its rights and obligations and this Agreement. Any attempted assignment or transfer in violation of the foregoing will be void. diff --git a/srcpkgs/CopyAgent/files/copy-agent.desktop b/srcpkgs/CopyAgent/files/copy-agent.desktop deleted file mode 100644 index bfe4fbe19da..00000000000 --- a/srcpkgs/CopyAgent/files/copy-agent.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Copy -GenericName=Network Storage -Comment=Copy.com Sync Agent -Exec=CopyAgent -Icon=copy-agent -Terminal=false -Type=Application -Categories=Network; -StartupNotify=false diff --git a/srcpkgs/CopyAgent/files/copy-agent.png b/srcpkgs/CopyAgent/files/copy-agent.png deleted file mode 100644 index a3116e23da9..00000000000 Binary files a/srcpkgs/CopyAgent/files/copy-agent.png and /dev/null differ diff --git a/srcpkgs/CopyAgent/files/launch.sh b/srcpkgs/CopyAgent/files/launch.sh deleted file mode 100755 index 7afe329b4b1..00000000000 --- a/srcpkgs/CopyAgent/files/launch.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -export LD_LIBRARY_PATH=/opt/copy -exec /opt/copy/${0##*/} $@ diff --git a/srcpkgs/CopyAgent/template b/srcpkgs/CopyAgent/template deleted file mode 100644 index 3cfd29f9eee..00000000000 --- a/srcpkgs/CopyAgent/template +++ /dev/null @@ -1,73 +0,0 @@ -# Template file for 'CopyAgent' -pkgname=CopyAgent -version=1.48.0451 -revision=1 -short_desc="Copy.com sync agent" -maintainer="ShadowKyogre " -homepage="https://www.copy.com" -license="CopyAgent" -_disturl="https://copy.com/install/linux/Copy.tgz" -distfiles="${_disturl}>${pkgname}-${version}.tar.gz" -checksum=f33c0297c2d8f7e90ec481beed88a918446a87507c9ea29f8feae21a4e85f72e -only_for_archs="i686 x86_64" -repository="nonfree" -nostrip="yes" -wrksrc="copy" -depends="qt>=4.8.4_4 fuse desktop-file-utils" - -do_install() { - if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then - cd x86_64 - elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then - cd x86 - else - cd armv6h - fi - - #vmkdir usr/bin - vmkdir opt/copy - - # Libraries for executable - for i in ca-bundle.crt lib{AgentSync,Brt,CloudSync,Gui}.so; do - vinstall "$i" 755 "opt/copy/" "$i" - done - - # Executable - for i in Copy{Agent,Cmd,Console}; do - vbin "${FILESDIR}/launch.sh" "$i" - vinstall "$i" 755 "opt/copy/" "$i" - done - - # Icon - vinstall "${FILESDIR}/copy-agent.png" 644 usr/share/pixmaps copy-agent.png - - # Desktop file - vinstall "${FILESDIR}/copy-agent.desktop" 644 usr/share/applications - - # License - vlicense "${FILESDIR}/TERMS" - - # nautilus and caja extensions - vinstall libnautilus-copy.so 755 "usr/lib/nautilus/extensions-3.0" libnautilus-copy.so - vinstall libcaja-copy.so 755 "usr/lib/caja/extensions-2.0" libcaja-copy.so -} - -nautilus-CopyAgent_package() { - short_desc+=" - Nautilus extension" - nostrip="yes" - depends="${sourcepkg}" - allow_unknown_shlibs=yes - pkg_install() { - vmove "usr/lib/nautilus/extensions-3.0" - } -} - -caja-CopyAgent_package() { - short_desc+=" - Caja extension" - nostrip="yes" - depends="${sourcepkg}" - allow_unknown_shlibs=yes - pkg_install() { - vmove "usr/lib/caja/extensions-2.0" - } -} diff --git a/srcpkgs/CopyQ/template b/srcpkgs/CopyQ/template index c9af47f08a8..27bdeb2933b 100644 --- a/srcpkgs/CopyQ/template +++ b/srcpkgs/CopyQ/template @@ -1,6 +1,6 @@ # Template file for 'CopyQ' pkgname=CopyQ -version=3.0.3 +version=3.1.1 revision=1 build_style=cmake hostmakedepends="qt5-host-tools qt5-tools-devel" @@ -10,5 +10,5 @@ maintainer="Enno Boland " license="GPL-3" homepage="https://hluk.github.io/CopyQ/" distfiles="https://github.com/hluk/CopyQ/archive/v${version}.tar.gz" -checksum=1a27e228120184ff036584e7db569c4cf44007e19353c1e899faafc9a83fb5ed +checksum=d370f1a76d7c195263f00a3a1259a7f6d34ac54e4cc987ef057c165c8ef55fe0 configure_args="-DWITH_QT5=TRUE" diff --git a/srcpkgs/FreeDoko/patches/makefiles.patch b/srcpkgs/FreeDoko/patches/makefiles.patch new file mode 100644 index 00000000000..1993372540b --- /dev/null +++ b/srcpkgs/FreeDoko/patches/makefiles.patch @@ -0,0 +1,152 @@ +--- Makefile 2017-09-19 14:31:03.514658296 +0200 ++++ Makefile 2017-09-19 14:32:36.773662266 +0200 +@@ -78,8 +78,13 @@ + .PHONY: compile + compile: + # compile FreeDoko +- $(MAKE) Version +- $(MAKE) -C src/ FreeDoko ++# cannot build with network due to lacking gnet package ++ $(MAKE) \ ++ "USE_UI_TEXT=false" \ ++ "USE_UI_GTKMM=true" \ ++ "USE_NETWORK=false" \ ++ "CPPFLAGS+= -DRELEASE -DVERSION_DESCRIPTION='\"$(OPERATING_SYSTEM_NAME) binary\"' -DPUBLIC_DATA_DIRECTORY_VALUE='\"$(DATA_DIRECTORY)\"' -DMANUAL_DIRECTORY_VALUE='\"$(HELP_DIRECTORY)/manual\"'" \ ++ -C src/ FreeDoko + @echo "---" + @echo "* Program 'FreeDoko' created" + +@@ -289,22 +294,11 @@ + ifeq ($(OPERATING_SYSTEM), Linux) + .PHONY: install + install : +- $(MAKE) \ +- --always-make \ +- "USE_UI_TEXT=false" \ +- "USE_UI_GTKMM=true" \ +- "USE_NETWORK=true" \ +- "CXXFLAGS=-Wall -Werror -Wno-parentheses -pipe -Os -std=c++14" \ +- "CPPFLAGS=-DRELEASE -DVERSION_DESCRIPTION='\"$(OPERATING_SYSTEM_NAME) binary\"' -DPUBLIC_DATA_DIRECTORY_VALUE='\"$(DATA_DIRECTORY)\"' -DMANUAL_DIRECTORY_VALUE='\"$(HELP_DIRECTORY)/manual\"'" \ +- -C src \ +- $(PROGRAM) +- $(MAKE) -C src strip + # Copying the program + echo "Copying the program" + mkdir -p $(DESTDIR)$(BIN_DIRECTORY) + cp src/FreeDoko $(DESTDIR)$(BIN_DIRECTORY) +- -chgrp games $(DESTDIR)$(BIN_DIRECTORY)/FreeDoko +- chmod 750 $(DESTDIR)$(BIN_DIRECTORY)/FreeDoko ++ chmod 755 $(DESTDIR)$(BIN_DIRECTORY)/FreeDoko + cd $(DESTDIR)$(BIN_DIRECTORY) && ln -sf FreeDoko freedoko + # Copying the data files + echo "Copying the data files" +@@ -315,21 +309,20 @@ + echo "Copying the documentation" + mkdir -p $(DESTDIR)$(HELP_DIRECTORY) + cp AUTHORS COPYING ChangeLog $(DESTDIR)$(HELP_DIRECTORY)/ +- $(MAKE) -C doc install ++# cannot build docs due to lacking latex packages ++# $(MAKE) -C doc install + # update the manual page + echo "update the manual page" + a2x -f manpage doc/freedoko.asciidoc + mkdir -p $(DESTDIR)$(MAN_DIRECTORY) + cp doc/freedoko.6 $(DESTDIR)$(MAN_DIRECTORY)/ +- -chgrp games $(DESTDIR)$(MAN_DIRECTORY)/freedoko.6 +- chmod 640 $(DESTDIR)$(MAN_DIRECTORY)/freedoko.6 ++ chmod 644 $(DESTDIR)$(MAN_DIRECTORY)/freedoko.6 + cd $(DESTDIR)$(MAN_DIRECTORY)/ && ln -sf freedoko.6 FreeDoko.6 + # copy the icon + echo "copy the icon" + mkdir -p $(DESTDIR)$(ICON_DIRECTORY) + cp src/FreeDoko.png $(DESTDIR)$(ICON_DIRECTORY)/ +- -chgrp games $(DESTDIR)$(ICON_DIRECTORY)/FreeDoko.png +- chmod 640 $(DESTDIR)$(ICON_DIRECTORY)/FreeDoko.png ++ chmod 644 $(DESTDIR)$(ICON_DIRECTORY)/FreeDoko.png + + .PHONY: uninstall + uninstall : +--- Makefile.install.directories 2017-09-19 14:31:03.514658296 +0200 ++++ Makefile.install.directories 2017-09-19 14:32:36.774662266 +0200 +@@ -4,13 +4,13 @@ + # the different directories for the files + + # installing in /usr/local +-MAIN_DIRECTORY = /usr/local +-BIN_DIRECTORY = $(MAIN_DIRECTORY)/games +-DATA_DIRECTORY = $(MAIN_DIRECTORY)/share/games/FreeDoko +-HELP_DIRECTORY = $(MAIN_DIRECTORY)/share/doc/FreeDoko +-MAN_DIRECTORY = $(MAIN_DIRECTORY)/share/man/man6 +-ICON_DIRECTORY = $(MAIN_DIRECTORY)/share/pixmaps +-DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications ++#MAIN_DIRECTORY = /usr/local ++#BIN_DIRECTORY = $(MAIN_DIRECTORY)/games ++#DATA_DIRECTORY = $(MAIN_DIRECTORY)/share/games/FreeDoko ++#HELP_DIRECTORY = $(MAIN_DIRECTORY)/share/doc/FreeDoko ++#MAN_DIRECTORY = $(MAIN_DIRECTORY)/share/man/man6 ++#ICON_DIRECTORY = $(MAIN_DIRECTORY)/share/pixmaps ++#DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications + + # debian + #MAIN_DIRECTORY = /usr +@@ -57,6 +57,15 @@ + #ICON_DIRECTORY = $(MAIN_DIRECTORY)/share/pixmaps + #DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications + ++# Void Linux ++MAIN_DIRECTORY = /usr ++BIN_DIRECTORY = $(MAIN_DIRECTORY)/bin ++DATA_DIRECTORY = $(MAIN_DIRECTORY)/share/FreeDoko ++HELP_DIRECTORY = $(MAIN_DIRECTORY)/share/doc/FreeDoko ++MAN_DIRECTORY = $(MAIN_DIRECTORY)/share/man/man6 ++ICON_DIRECTORY = $(MAIN_DIRECTORY)/share/pixmaps ++DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications ++ + + # release + # where the temporary release files are saved +--- bin/FreeDoko.desktop 2017-09-19 14:31:03.515658296 +0200 ++++ bin/FreeDoko.desktop 2017-09-19 14:32:36.775662266 +0200 +@@ -6,7 +6,7 @@ + Comment=game of Doppelkopf + Comment[de]=Doppelkopf-Spiel + Comment[fr]=un jeu de Doppelkopf +-Exec=/usr/games/freedoko ++Exec=/usr/bin/freedoko + Path= + Icon=FreeDoko + Categories=Application;Game;CardGame; +--- data/Makefile 2017-09-19 14:31:03.618658300 +0200 ++++ data/Makefile 2017-09-19 14:32:36.775662266 +0200 +@@ -40,8 +40,7 @@ + for d in cardsets iconsets backgrounds sounds; do \ + $(MAKE) -C $$d install; \ + done +- -chgrp games $(DESTDIR)$(DATA_DIRECTORY) && chgrp -R games $(DESTDIR)$(DATA_DIRECTORY) +- chmod -R o-rwx,g+rX,g-w $(DESTDIR)$(DATA_DIRECTORY) ++ chmod -R o-rwx,g+rX,g-w,+rX $(DESTDIR)$(DATA_DIRECTORY) + endif + + ifeq ($(SHELLTYPE), sh) +--- doc/Makefile 2017-09-19 14:31:03.684658303 +0200 ++++ doc/Makefile 2017-09-19 14:32:36.776662266 +0200 +@@ -36,8 +36,7 @@ + fi + cp -a Bugs GPL Roadmap hpux.required_libs-ia64.txt $(DESTDIR)$(HELP_DIRECTORY)/ + for d in de en; do $(MAKE) -C $$d install; done +- -chgrp games $(DESTDIR)$(HELP_DIRECTORY) && chgrp -R games $(DESTDIR)$(HELP_DIRECTORY) +- chmod -R o-rwx,g+rX,g-w $(DESTDIR)$(HELP_DIRECTORY) ++ chmod -R o-rwx,g+rX,g-w,+rX $(DESTDIR)$(HELP_DIRECTORY) + cd $(DESTDIR)$(DATA_DIRECTORY) && ln -sf $(HELP_DIRECTORY)/ doc + endif + +--- src/Makefile 2017-09-19 14:31:03.383658290 +0200 ++++ src/Makefile 2017-09-19 14:32:36.777662266 +0200 +@@ -252,6 +252,7 @@ + $(INCLUDE_ALL) \ + $(LIBS_ALL) \ + $(CXXFLAGS) \ ++ $(LDFLAGS) \ + -o $@ + @echo "$(PROGRAM) compiled successfully" + diff --git a/srcpkgs/FreeDoko/template b/srcpkgs/FreeDoko/template new file mode 100644 index 00000000000..a9b032a1a19 --- /dev/null +++ b/srcpkgs/FreeDoko/template @@ -0,0 +1,26 @@ +# Template file for 'FreeDoko' +pkgname=FreeDoko +version=0.7.16 +revision=1 +wrksrc="FreeDoko_${version}" +build_style=gnu-makefile +make_build_target="compile" +hostmakedepends="unzip pkg-config asciidoc" +makedepends="gtkmm-devel freealut-devel" +short_desc="Free implementation of the card game Doppelkopf" +maintainer="Michael Straube " +homepage="http://free-doko.sourceforge.net/en/FreeDoko.html" +license="GPL-2" +distfiles="${SOURCEFORGE_SITE}/free-doko/FreeDoko_${version}.src.zip" +checksum=6fdcee22b3e9a76d44d8c3a582d068452290ec4c24f8f2f9e4498adf4daf40af + +post_extract() { + rm manual/{de/Makefile,en/Makefile,Makefile} + rm manual/de/operation/pictures/Regeln/create_screenshots.sh + find manual -type f -exec chmod 644 {} \; +} + +post_install() { + vinstall bin/FreeDoko.desktop 644 usr/share/applications + vcopy manual usr/share/doc/FreeDoko +} diff --git a/srcpkgs/GCP-Guest-Environment/template b/srcpkgs/GCP-Guest-Environment/template index 7b4c7232192..feb55e2929c 100644 --- a/srcpkgs/GCP-Guest-Environment/template +++ b/srcpkgs/GCP-Guest-Environment/template @@ -1,7 +1,7 @@ # Template file for 'GCP-Guest-Environment' pkgname=GCP-Guest-Environment -version=20170718 -revision=2 +version=20171006 +revision=1 noarch=yes wrksrc="compute-image-packages-${version}" build_style=python2-module @@ -17,7 +17,7 @@ maintainer="Michael Aldridge " license="Apache-2.0" homepage="https://github.com/GoogleCloudPlatform/compute-image-packages" distfiles="https://github.com/GoogleCloudPlatform/compute-image-packages/archive/${version}.tar.gz" -checksum=c161a4d5a86e40be981bcb3a31aeb3bf9995b96d8302ef800a0251b17f72b254 +checksum=16f6aae2d4370207f961554a0a3c50960886decfe607fdc06a5a389eaeb62eaf post_install() { for _i in Guest-Initialization accounts clock-skew ip-forwarding ; do diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template index c21bfd534c8..14f4e0124dc 100644 --- a/srcpkgs/ImageMagick/template +++ b/srcpkgs/ImageMagick/template @@ -1,7 +1,7 @@ # Template file for 'ImageMagick' pkgname=ImageMagick _majorver=6.9.9 -_patchver=19 +_patchver=20 version=${_majorver}.${_patchver} revision=1 wrksrc=${pkgname}-${_majorver}-${_patchver} @@ -16,7 +16,7 @@ maintainer="Juan RP " homepage="https://www.imagemagick.org/" license="ImageMagick" distfiles="https://www.imagemagick.org/download/ImageMagick-${_majorver}-${_patchver}.tar.xz" -checksum=330efe70c38d86b95337f67015c465c8d910d8e96632ee72e09017120546d1ab +checksum=72131caaee1c673923709f7353b6731b43a2735b29110deac5121db403b07f0f subpackages="libmagick libmagick-devel" diff --git a/srcpkgs/ModemManager/template b/srcpkgs/ModemManager/template index b4291c6a9e1..6dfb4ed6461 100644 --- a/srcpkgs/ModemManager/template +++ b/srcpkgs/ModemManager/template @@ -1,6 +1,6 @@ # Template file for 'ModemManager' pkgname=ModemManager -version=1.6.8 +version=1.6.10 revision=1 build_style=gnu-configure configure_args="--disable-static --sbindir=/usr/bin @@ -16,7 +16,7 @@ maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/ModemManager/" license="GPL-2" distfiles="$FREEDESKTOP_SITE/$pkgname/$pkgname-$version.tar.xz" -checksum=ffc035c4bfeb07780c4580bb4488ade0ab1d197c3cdf89cb8ab36386cfb34376 +checksum=bc74326fa69ae8012f806e235f3d296144922669b952d4d4987dd0af645d5f68 build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template index 493a4a5035d..f7c108857bd 100644 --- a/srcpkgs/adobe-flash-plugin/template +++ b/srcpkgs/adobe-flash-plugin/template @@ -1,6 +1,6 @@ # Template file for 'adobe-flash-plugin' pkgname=adobe-flash-plugin -version=27.0.0.159 +version=27.0.0.170 revision=1 # The EULA file _eula="https://www.adobe.com/content/dam/Adobe/en/legal/licenses-terms/pdf/PlatformClients_PC_WWEULA-en_US-20150407_1357.pdf" @@ -8,10 +8,10 @@ _eulacksum=2851b4b39df44a2777c6c07e1f59cbc3055a346d2e775121b9ed38e0a4bf40d2 _url=http://fpdownload.adobe.com/get/flashplayer/pdc/${version} if [ "$XBPS_MACHINE" = "x86_64" ]; then _disttarball="${_url}/flash_player_npapi_linux.x86_64.tar.gz" - _distcksum=2d5aff35d00b7f443b69ba40f1250ea5cbe5b5cb67520a642a17a602ec3723dc + _distcksum=966761fda5fc29301cd7720dc1e84b2551d142e7e5d51e3898e8e6fe7c11cc43 else _disttarball="${_url}/flash_player_npapi_linux.i386.tar.gz" - _distcksum=3443daf0bb70532e754ed4ffc7090e68f8faf41f2e9fc4663437e20badcc881a + _distcksum=a06d815d2858e58b0f11624a6567da3de17db27df68a3527a7774ba21f4558cb fi distfiles="${_eula} ${_disttarball}" checksum="${_eulacksum} ${_distcksum}" diff --git a/srcpkgs/adom/template b/srcpkgs/adom/template new file mode 100644 index 00000000000..960d9272604 --- /dev/null +++ b/srcpkgs/adom/template @@ -0,0 +1,35 @@ +# Template file for 'adom' +pkgname=adom +version=60 +revision=1 +wrksrc=${pkgname} +depends="ncurses" +short_desc="A roguelike game with a quest-centric, plot driven structure" +maintainer="Diogo Leal " +license="Proprietary" +homepage="http://www.adom.de" +_download_url="http://www.ancardia.com/download" +nopie=yes +nostrip=yes +repository=nonfree + +if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ];then + distfiles="${_download_url}/adom_linux_debian_64_r${version}_pub.tar.gz" + checksum=e36ec001566cb8bc4c5857dcfa8839b0797888be2c1e3b8476e8c5a9bb93ce2c + +elif [ "${XBPS_TARGET_MACHINE}" = "i686" ];then + distfiles="${_download_url}/adom_linux_debian_32_r${version}_pub.tar.gz" + checksum=20b1aba07ac7d90a9437937ae5714fbb0199d2ba460d3b18473370baca665554 + +else + _platform=arm + distfiles="http://www.ancardia.com/download/adom_linux_arm_r${version}_pub.tar.gz" + checksum=85fd4dbcf127d41c4b44abdbcf13b7efdb0bfa8777efa1659a4071d20cbd80d5 +fi + +do_install() { + vbin adom + vdoc docs/adomfaq.txt + vdoc docs/manual.txt + vdoc docs/readme1st.txt +} diff --git a/srcpkgs/alarm-clock/template b/srcpkgs/alarm-clock/template index 4951d1977e5..04419cd9ec0 100644 --- a/srcpkgs/alarm-clock/template +++ b/srcpkgs/alarm-clock/template @@ -1,6 +1,6 @@ # Template file for 'alarm-clock' pkgname=alarm-clock -version=1.4.7 +version=1.4.9 revision=1 build_style=gnu-configure hostmakedepends="automake intltool pkg-config" @@ -10,4 +10,4 @@ short_desc="Simple GTK2 alarm clock for your desktop" homepage="https://github.com/shaggytwodope/alarm-clock" license="GPL-3" distfiles="https://github.com/shaggytwodope/alarm-clock/archive/v${version}.tar.gz" -checksum=5d04518a16353f781f5f0f499ae57b0951d846e8bd14cd228d1c49605916f26c +checksum=3724a42801befaee631d249edd8b15318bb72ae5f9db918c25de513f4c3f4538 diff --git a/srcpkgs/allegro4/template b/srcpkgs/allegro4/template index 94c8aa2c14f..86539788cf4 100644 --- a/srcpkgs/allegro4/template +++ b/srcpkgs/allegro4/template @@ -1,7 +1,7 @@ # Template file for 'allegro4'. pkgname=allegro4 version=4.4.2 -revision=5 +revision=6 wrksrc="allegro-${version}" build_style=cmake configure_args="-DWANT_DOCS=OFF" @@ -18,6 +18,10 @@ distfiles="${SOURCEFORGE_SITE}/alleg/allegro-$version.tar.gz" checksum=1b21e7577dbfada02d85ca4510bd22fedaa6ce76fde7f4838c7c1276eb840fdc nocross=yes +post_install() { + vlicense docs/txt/license.txt +} + allegro4-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template new file mode 100644 index 00000000000..56e5c76d7f9 --- /dev/null +++ b/srcpkgs/antibody/template @@ -0,0 +1,17 @@ +# Template file for 'antibody' +pkgname=antibody +version=3.3.2 +revision=1 +build_style=go +go_import_path="github.com/getantibody/antibody" +hostmakedepends="git" +short_desc="Fast and lightweight shell plugin manager" +maintainer="SolitudeSF " +license="MIT" +homepage="https://getantibody.github.io/" +distfiles="https://${go_import_path}/archive/v${version}.tar.gz" +checksum=0cbe03b4345124b79b3f2961dc047599d1548ec03dd72139c35eb83876c24bb0 + +post_install() { + vlicense LICENSE.md +} diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template index 53805bbfea2..77a48a05307 100644 --- a/srcpkgs/aria2/template +++ b/srcpkgs/aria2/template @@ -1,6 +1,6 @@ # Template file for 'aria2' pkgname=aria2 -version=1.32.0 +version=1.33.0 revision=1 build_style=gnu-configure configure_args="--with-openssl --with-libexpat --without-gnutls @@ -14,4 +14,4 @@ maintainer="Juan RP " license="GPL-2" homepage="https://aria2.github.io/" distfiles="https://github.com/tatsuhiro-t/aria2/releases/download/release-${version}/${pkgname}-${version}.tar.xz" -checksum=546e9194a9135d665fce572cb93c88f30fb5601d113bfa19951107ced682dc50 +checksum=996e3fc2fd07ce2dd517e20a1f79b8b3dbaa5c7e27953b5fc19dae38f3874b8c diff --git a/srcpkgs/arp-scan/patches/fix-crossbuild.patch b/srcpkgs/arp-scan/patches/fix-crossbuild.patch new file mode 100644 index 00000000000..38cbfc8bc3e --- /dev/null +++ b/srcpkgs/arp-scan/patches/fix-crossbuild.patch @@ -0,0 +1,12 @@ +--- acinclude.m4 ++++ acinclude.m4 +@@ -212,7 +211,8 @@ done])dnl AC_CACHE_VAL + LONG_LONG_INT_FORMAT='' + + case $pgac_cv_snprintf_long_long_int_format in +- cross) AC_MSG_RESULT([cannot test (not on host machine)]);; ++ cross) AC_MSG_RESULT([assuming %lld for cross compilation]) ++ LONG_LONG_INT_FORMAT='%lld';; + ?*) AC_MSG_RESULT([$pgac_cv_snprintf_long_long_int_format]) + LONG_LONG_INT_FORMAT=$pgac_cv_snprintf_long_long_int_format;; + *) AC_MSG_RESULT(none);; diff --git a/srcpkgs/arp-scan/template b/srcpkgs/arp-scan/template new file mode 100644 index 00000000000..acc79cf51e5 --- /dev/null +++ b/srcpkgs/arp-scan/template @@ -0,0 +1,17 @@ +# Template file for 'arp-scan' +pkgname=arp-scan +version=1.9 +revision=1 +build_style=gnu-configure +hostmakedepends="automake" +makedepends="libpcap-devel" +short_desc="A tool that uses ARP to discover IP hosts on the local network" +maintainer="Urs Schulz " +license="GPL-3" +homepage="http://www.nta-monitor.com/tools/arp-scan/" +distfiles="https://github.com/royhills/$pkgname/archive/$version/$pkgname-$version.tar.gz" +checksum=b2a446a170e4a2feeb825cd08db48a147f8dffae702077f33e456c4200e7afb0 + +pre_configure() { + autoreconf --install +} diff --git a/srcpkgs/aspell-pl/template b/srcpkgs/aspell-pl/template new file mode 100755 index 00000000000..6c5a1dbf8e8 --- /dev/null +++ b/srcpkgs/aspell-pl/template @@ -0,0 +1,14 @@ +# Template file for 'aspell-pl' +pkgname=aspell-pl +version=20061121 +revision=1 +noarch=yes +wrksrc="aspell6-pl-6.0_${version}-0" +build_style=configure +hostmakedepends="aspell-devel" +short_desc="Polish dictionary for aspell" +homepage="http://aspell.net/" +license="GPL-2" +maintainer="Piotr Wójcik " +distfiles="${GNU_SITE}/aspell/dict/pl/aspell6-pl-6.0_${version}-0.tar.bz2" +checksum=017741fcb70a885d718c534160c9de06b03cc72f352879bd106be165e024574d diff --git a/srcpkgs/autoconf-archive/template b/srcpkgs/autoconf-archive/template index 6fc58898a19..413fe3ce72a 100644 --- a/srcpkgs/autoconf-archive/template +++ b/srcpkgs/autoconf-archive/template @@ -1,6 +1,6 @@ # Template file for 'autoconf-archive' pkgname=autoconf-archive -version=2017.03.21 +version=2017.09.28 revision=1 noarch=yes build_style=gnu-configure @@ -10,4 +10,4 @@ maintainer="Steve Prybylski " license="GPL-3" homepage="http://www.gnu.org/software/autoconf-archive/" distfiles="http://ftpmirror.gnu.org/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=386ad455f12bdeb3a7d19280441a5ab77355142349200ff11040a8d9d455d765 +checksum=5c9fb5845b38b28982a3ef12836f76b35f46799ef4a2e46b48e2bd3c6182fa01 diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template index ec0d134d803..bd896ce7387 100644 --- a/srcpkgs/avahi-discover/template +++ b/srcpkgs/avahi-discover/template @@ -5,7 +5,7 @@ # pkgname=avahi-discover version=0.7 -revision=1 +revision=3 wrksrc="avahi-${version}" noarch=yes build_style=gnu-configure @@ -15,9 +15,9 @@ configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --with-avahi-priv-access-group=network --with-autoipd-user=avahi --with-autoipd-group=avahi --with-distro=none --disable-xmltoman --disable-dbm --without-systemdsystemunitdir - --disable-static ssp_cv_lib=no --enable-python --enable-pygtk + --disable-static ssp_cv_lib=no --enable-python --enable-glib --enable-gobject --enable-gtk --enable-gtk3 - $(vopt_enable gir introspection)" + $(vopt_enable gir introspection) $(vopt_enable gir pygobject)" short_desc="Service discover user interface for avahi" maintainer="Juan RP " license="LGPL-2.1" @@ -28,7 +28,7 @@ checksum=57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804 hostmakedepends="automake libtool pkg-config intltool pygtk-devel python-dbus gobject-introspection glib-devel" makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel - pygtk-devel python-dbus gtk+3-devel python-gobject-devel" + pygtk-devel python-dbus gtk+3-devel $(vopt_if gir python-gobject-devel)" depends="avahi>=$version python avahi-python>=$version python-dbus pygtk desktop-file-utils" pycompile_module="avahi_discover" @@ -59,7 +59,7 @@ do_install() { vmkdir usr/lib/pkgconfig vmkdir usr/share/avahi/interfaces - for f in bvnc bssh bshell avahi-bookmarks avahi-discover avahi-discover-standalone; do + for f in bvnc bssh bshell avahi-bookmarks $(vopt_if gir avahi-discover) $(vopt_if gir avahi-discover-standalone); do mv ${wrksrc}/tmpinstall/usr/bin/${f} ${DESTDIR}/usr/bin if [ -f ${wrksrc}/tmpinstall/usr/share/man/man1/${f}.1 ]; then mv ${wrksrc}/tmpinstall/usr/share/man/man1/${f}.1 ${DESTDIR}/usr/share/man/man1 @@ -161,7 +161,9 @@ avahi-ui-utils_package() { vmove usr/share/applications/bvnc.desktop vmove usr/share/applications/bssh.desktop vmove usr/share/man/man1/bssh.1 - vmove usr/bin/avahi-discover-standalone + if [ "$build_option_gir" ]; then + vmove usr/bin/avahi-discover-standalone + fi vmove usr/bin/bssh vmove usr/share/man/man1/bvnc.1 vmove usr/bin/bvnc diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template index 66c2cb855b8..60d7870d56b 100644 --- a/srcpkgs/avahi/template +++ b/srcpkgs/avahi/template @@ -1,7 +1,7 @@ # Template file for 'avahi' pkgname=avahi version=0.7 -revision=1 +revision=3 build_style=gnu-configure configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl diff --git a/srcpkgs/azpainter/template b/srcpkgs/azpainter/template index 0e710c28d69..88b48c0b35a 100644 --- a/srcpkgs/azpainter/template +++ b/srcpkgs/azpainter/template @@ -1,6 +1,6 @@ # Template file for 'azpainter' pkgname=azpainter -version=2.0.6 +version=2.1.1 revision=1 build_style=gnu-configure hostmakedepends="automake" @@ -10,8 +10,8 @@ short_desc="Full-color painting software for illustration drawing" maintainer="Alexander Mamay " license="GPL-3" homepage="https://osdn.net/projects/azpainter/" -distfiles="http://osdn.dl.osdn.net/azpainter/67805/azpainter-${version}.tar.bz2" -checksum=f7f1c0bff9f0fe2fe6864c051a91f6e2b931c527a0e75ecde91170142163a321 +distfiles="http://osdn.dl.osdn.net/azpainter/68339/azpainter-${version}.tar.xz" +checksum=f70111edbbbbd512a48954289be130ecc7f3ff39cc8ccb3cc6b9e9cfdd3c932b CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2" diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template index d943dbb1e6a..b4e63adc43d 100644 --- a/srcpkgs/bacula-common/template +++ b/srcpkgs/bacula-common/template @@ -1,6 +1,6 @@ # Template file for 'bacula-common' pkgname="bacula-common" -version="7.4.7" +version="9.0.4" revision=1 build_style=gnu-configure _common_desc="Bacula - A Network Backup Tool " @@ -9,7 +9,7 @@ maintainer="Matthias Fulz " license="AGPL-3" homepage="http://www.bacula.org" distfiles="${SOURCEFORGE_SITE}/bacula/bacula-${version}.tar.gz" -checksum="6f6075c2ca90a63cdeeca39b0b82a3ea07ce9999dedc68951d88bed7fbc0be40" +checksum=cafa2d9a9e89a77d3b79984972487e72fb90d949269c77a74a68e97a9d28996f configure_args=" --with-openssl --with-sqlite3 --with-mysql --with-postgresql --enable-smartalloc --sysconfdir=/etc/bacula diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template index 69de97f84b7..bfb564bd5c6 100644 --- a/srcpkgs/baobab/template +++ b/srcpkgs/baobab/template @@ -1,6 +1,6 @@ # Template file for 'baobab' pkgname=baobab -version=3.26.0 +version=3.26.1 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile" @@ -12,4 +12,4 @@ maintainer="Enno Boland " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=ca07c18c8582f6c2fcb54b414f0b9057ebe53e54296c3ce9ccee44b78e86b2db +checksum=7a59ab5945f5d90725231b10d85a1893403f56660b1627c111d2b4eeb1ef787e diff --git a/srcpkgs/bash-preexec/template b/srcpkgs/bash-preexec/template index 94150897040..e6c857a3132 100644 --- a/srcpkgs/bash-preexec/template +++ b/srcpkgs/bash-preexec/template @@ -1,6 +1,6 @@ # Template file for 'bash-preexec' pkgname=bash-preexec -version=0.3.4 +version=0.3.5 revision=1 noarch=yes depends="bash" @@ -9,8 +9,9 @@ maintainer="Andrea Brancaleoni " license="MIT" homepage="https://github.com/rcaloras/bash-preexec" distfiles="https://github.com/rcaloras/bash-preexec/archive/${version}.tar.gz" -checksum=a3050e1672ebc2374e235ea7879f129a62dfddc95875ba90e86271a48f6548b9 +checksum=197f5107f84a4b4caadc57f908f2b72a911c95ae36412d1b166c4c1b20b2da8b do_install() { vbin bash-preexec.sh + vlicense LICENSE.md } diff --git a/srcpkgs/bdf2psf/template b/srcpkgs/bdf2psf/template index e0c118ce04f..3501a541d83 100644 --- a/srcpkgs/bdf2psf/template +++ b/srcpkgs/bdf2psf/template @@ -1,15 +1,15 @@ # Template file for 'bdf2psf' pkgname=bdf2psf -version=1.167 +version=1.168 revision=1 -wrksrc="console-setup-${version}" +wrksrc="console-setup" depends="perl" short_desc="Generate console fonts from BDF source fonts" maintainer="Leah Neukirchen " license="GPL-2" homepage="https://packages.debian.org/sid/bdf2psf" distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz" -checksum=fc3411ec214e3f6182701c30fefa1f1c708f4d8232c5a1c699cef70d6676bdf9 +checksum=5e0a419c3384de0566f72770e7dd61680cb9a8352c01eae3d4db3c3a34567347 noarch=yes post_extract() { diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template index 73e61271234..753997e7476 100644 --- a/srcpkgs/bijiben/template +++ b/srcpkgs/bijiben/template @@ -1,6 +1,6 @@ # Template file for 'bijiben' pkgname=bijiben -version=3.26.0 +version=3.26.1 revision=1 build_style=gnu-configure configure_args="--disable-update-mimedb" @@ -16,7 +16,7 @@ maintainer="Juan RP " homepage="http://live.gnome.org/Apps/Bijiben" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=72919f30452df4a66164365989610e0c3b54516ff8a83b3483fa370df39ec652 +checksum=4f5bc9f5b86162038f24f4a02a659500f294b6811de8e77ed61a3bd6ec20d499 pre_configure() { # poor mans tracker-2.0 compatibility fix. diff --git a/srcpkgs/blueman/template b/srcpkgs/blueman/template index 8597c0117cb..6cfb8f95470 100644 --- a/srcpkgs/blueman/template +++ b/srcpkgs/blueman/template @@ -1,7 +1,7 @@ # Template file for 'blueman' pkgname=blueman -version=2.0.4 -revision=4 +version=2.0.5 +revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="intltool pkg-config python-Cython" @@ -13,4 +13,8 @@ maintainer="Juan RP " license="GPL-3" homepage="https://github.com/blueman-project/blueman" distfiles="https://github.com/blueman-project/blueman/releases/download/${version}/blueman-${version}.tar.xz" -checksum=e92dd9c27f75a1485b548f7a8b159946a4af154b90fb82f5a0f614b66a01430f +checksum=2c2eb9bbdcb6056eebcae1bec758f6a8ec752739b65794f6be3e0066ca1f88ca + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" python-dbus-devel" +fi diff --git a/srcpkgs/bsatool b/srcpkgs/bsatool new file mode 120000 index 00000000000..b54e95dedd1 --- /dev/null +++ b/srcpkgs/bsatool @@ -0,0 +1 @@ +openmw \ No newline at end of file diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template index 3c2780d6f57..6c4579cc547 100644 --- a/srcpkgs/btrfs-progs/template +++ b/srcpkgs/btrfs-progs/template @@ -1,6 +1,6 @@ # Template file for 'btrfs-progs' pkgname=btrfs-progs -version=4.13.2 +version=4.13.3 revision=1 wrksrc=${pkgname}-v${version} build_style=gnu-configure @@ -12,7 +12,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://btrfs.wiki.kernel.org/" distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz" -checksum=75c7331f1306495dfffabe542ef6c5539808f0cdaebdf14fa8b7ab09c59448bd +checksum=805bdb0031c21a0a5d2ba295a8c9bdd8ba831a68c3fa801aab85677ec902d783 pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/bullet/template b/srcpkgs/bullet/template index af33caac7bf..b185d060bcc 100644 --- a/srcpkgs/bullet/template +++ b/srcpkgs/bullet/template @@ -1,18 +1,18 @@ # Template file for 'bullet' pkgname=bullet -version=2.83.7 +version=2.86.1 revision=1 wrksrc="bullet3-${version}" build_style=cmake -configure_args="-DBUILD_SHARED_LIBS=1 -DBUILD_OPENGL_DEMOS=0 -DBUILD_BULLET2_DEMOS=0 - -DBUILD_MULTITHREADING=1 -DBUILD_EXTRAS=1 -DINSTLAL_LIBS=1 -DINSTALL_EXTRA_LIBS=1" +configure_args="-DBUILD_SHARED_LIBS=1 -DBUILD_BULLET2_DEMOS=0 -DBUILD_CPU_DEMOS=0 + -DBUILD_UNIT_TESTS=0 -DBUILD_OPENGL3_DEMOS=0 -DBUILD_EXTRAS=1 -DINSTALL_EXTRA_LIBS=1" makedepends="glu-devel" short_desc="A 3D Collision Detection and Rigid Body Dynamics Library" maintainer="Juan RP " license="zlib" homepage="http://www.bulletphysics.com/Bullet/" distfiles="https://github.com/bulletphysics/bullet3/archive/${version}.tar.gz" -checksum=00d1d8f206ee85ffd171643ac8e72f9f4e0bf6dbf3d4ac55f4495cb168b51243 +checksum=c058b2e4321ba6adaa656976c1a138c07b18fc03b29f5b82880d5d8228fbf059 post_install() { vlicense LICENSE.txt diff --git a/srcpkgs/bumblebee-status/files/bumblebee-status b/srcpkgs/bumblebee-status/files/bumblebee-status new file mode 100644 index 00000000000..9a437182c7c --- /dev/null +++ b/srcpkgs/bumblebee-status/files/bumblebee-status @@ -0,0 +1,2 @@ +#!/bin/sh +python /usr/share/bumblebee-status/bumblebee-status "$@" diff --git a/srcpkgs/bumblebee-status/template b/srcpkgs/bumblebee-status/template new file mode 100644 index 00000000000..18db6bd6f8d --- /dev/null +++ b/srcpkgs/bumblebee-status/template @@ -0,0 +1,22 @@ +# Template file for 'bumblebee-status' +pkgname=bumblebee-status +version=1.3.0 +revision=1 +depends="python" +noarch=yes +short_desc="A modular, theme-able status line generator for the i3 window manager. " +maintainer="ibrokemypie " +license="MIT" +homepage="https://github.com/tobi-wan-kenobi/bumblebee-status" +distfiles="https://github.com/tobi-wan-kenobi/bumblebee-status/archive/v${version}.tar.gz" +checksum=42c68a3bb2fae2ef1d65a1be9287c2efc0a9250d018330f2e78abdd051796919 + +do_install() { + vmkdir usr/share/${pkgname} + vcopy bumblebee usr/share/${pkgname}/ + vcopy themes usr/share/${pkgname}/ + vcopy bumblebee-status usr/share/${pkgname}/ + vbin "${FILESDIR}/bumblebee-status" + vdoc README.md + vlicense LICENSE +} diff --git a/srcpkgs/bwidget/template b/srcpkgs/bwidget/template index 3c482da21d4..9a482a825e5 100644 --- a/srcpkgs/bwidget/template +++ b/srcpkgs/bwidget/template @@ -1,6 +1,6 @@ # Template file for 'bwidget' pkgname=bwidget -version=1.9.10 +version=1.9.11 revision=1 noarch=yes makedepends="tk" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="http://tcllib.sourceforge.net/" license="tcl/tk" distfiles="${SOURCEFORGE_SITE}/tcllib/BWidget/$version/${pkgname}-${version}.tar.gz" -checksum=26c312204bd9d065001e95fcac8fed0f63cb44e746204853f21813ac62aeb408 +checksum=448a1db08a4ca477ce339dfe592fd85c4c0649c3ff554fb4e86d6826d39bc8b9 do_install() { local _tclversion=8.6 diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template index 08612d03baf..4bcd1b17c70 100644 --- a/srcpkgs/caddy/template +++ b/srcpkgs/caddy/template @@ -1,7 +1,7 @@ # Template file for 'caddy' pkgname=caddy -version=0.10.8 -revision=2 +version=0.10.10 +revision=1 build_style=go go_import_path="github.com/mholt/caddy" go_package="${go_import_path}/caddy" @@ -11,7 +11,7 @@ maintainer="Dominic Monroe " license="Apache-2.0" homepage="https://caddyserver.com" distfiles="https://github.com/mholt/caddy/archive/v${version}.tar.gz" -checksum=3328efc8b64a428d49dd27edf44c0b1d9dfdc8879366663ce002bafc3a7b2b90 +checksum=aafaeb092e7b1bcff8ec31f19a1ded1253ff95cfdd4441378e5a530508614e8d system_accounts="caddy" make_dirs="/etc/caddy 0700 caddy caddy" diff --git a/srcpkgs/caja-CopyAgent b/srcpkgs/caja-CopyAgent deleted file mode 120000 index 550c72ab67d..00000000000 --- a/srcpkgs/caja-CopyAgent +++ /dev/null @@ -1 +0,0 @@ -CopyAgent \ No newline at end of file diff --git a/srcpkgs/cantata/template b/srcpkgs/cantata/template index 7c16cf019f7..ef7dbd1b524 100644 --- a/srcpkgs/cantata/template +++ b/srcpkgs/cantata/template @@ -1,19 +1,19 @@ # Template file for 'cantata' pkgname=cantata -version=2.1.0 +version=2.2.0 revision=1 build_style=cmake -hostmakedepends="pkg-config" +hostmakedepends="pkg-config qt5-qmake qt5-host-tools qt5-tools" makedepends="qt5-devel qt5-tools-devel qt5-svg-devel qt5-xmlpatterns-devel qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-odbc qt5-plugin-tds vlc-devel zlib-devel ffmpeg-devel taglib-devel taglib-extras-devel libmtp-devel mpg123-devel libcdparanoia-devel libcddb-devel speex-devel eudev-libudev-devel udisks2-devel libmusicbrainz5-devel - qt5-multimedia-devel" + qt5-multimedia-devel libcdio-paranoia-devel" depends="media-player-info" short_desc="Qt client for the music player daemon (MPD)" maintainer="LockeAnarchist " license="GPL-3" homepage="https://github.com/cdrummond/cantata" distfiles="https://github.com/CDrummond/cantata/releases/download/v${version}/${pkgname}-${version}.tar.bz2" -checksum=9317afcae75c709ec733da069d4245b47e6e2c297a259eaf87a181fa9d1cd4c4 +checksum=c84691eb17711118d3c512d70cb422267f7a137290082cdd1ff0a871b4a8e5c0 diff --git a/srcpkgs/cargo/patches/nonexhaustive.patch b/srcpkgs/cargo/patches/nonexhaustive.patch new file mode 100644 index 00000000000..9aa8d7321c9 --- /dev/null +++ b/srcpkgs/cargo/patches/nonexhaustive.patch @@ -0,0 +1,14 @@ +Without this patch, cargo fails to build in rust 1.20 due to: +error[E0004]: non-exhaustive patterns: `&__Nonexhaustive { }` not covered + +--- src/cargo/util/errors.rs.orig ++++ src/cargo/util/errors.rs +@@ -83,7 +83,7 @@ + &CargoErrorKind::Parse(_) | + &CargoErrorKind::Git(_) | + &CargoErrorKind::Internal(_) | +- &CargoErrorKind::CargoTestErrorKind(_) => false ++ &CargoErrorKind::CargoTestErrorKind(_) | _ => false + } + } + } diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index 3eb39c6b39d..d0fd91f9162 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,6 +1,6 @@ # Template file for 'cargo' pkgname=cargo -version=0.21.1 +version=0.22.0 revision=1 _githash_installer=4f994850808a572e2cc8d43f968893c8e942e9bf hostmakedepends="rust python curl cmake pkg-config" @@ -12,7 +12,7 @@ license="MIT, Apache-2.0" homepage="https://crates.io/" distfiles="https://github.com/rust-lang/cargo/archive/${version}.tar.gz https://github.com/rust-lang/rust-installer/archive/${_githash_installer}.tar.gz" -checksum="f2464d3cb3e431e45191b6f70e415c320d227ef3c3d134cea4e86357c0c72a33 +checksum="6740e2f8d035a5a5246a12e84a141d37ad4c2b826355aff497e6f1fcfb637aef dc7240d60a869fa24a68c8734fb7c810c27cca0a6dad52df6279865e4e8e7fae" nocross=yes diff --git a/srcpkgs/cava-gui/template b/srcpkgs/cava-gui/template new file mode 100644 index 00000000000..be17309f761 --- /dev/null +++ b/srcpkgs/cava-gui/template @@ -0,0 +1,24 @@ +# Template file for 'cava-gui' +pkgname=cava-gui +version=0.6.0 +revision=1 +wrksrc="cava-${version}" +build_style=gnu-configure +hostmakedepends="automake libtool" +makedepends="alsa-lib-devel pulseaudio-devel fftw-devel ncurses-devel + iniparser-devel SDL2-devel libX11-devel glu-devel" +short_desc="Console-based Audio Visualizer for ALSA (GUI branch)" +maintainer="nik123 " +homepage="https://github.com/nikp123/cava" +license="MIT" +distfiles="https://github.com/nikp123/cava/archive/${version}.tar.gz" +checksum="51abc92d4d77cb630a3389754b70cb03ef57db147711d8a2e8342a7854786dfa" +conflicts=cava + +pre_configure() { + NOCONFIGURE=1 ./autogen.sh +} + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/chromium-widevine/template b/srcpkgs/chromium-widevine/template index 108558fcb79..70c68cd06bb 100644 --- a/srcpkgs/chromium-widevine/template +++ b/srcpkgs/chromium-widevine/template @@ -3,7 +3,7 @@ _chromeVersion="current" _channel="stable" pkgname=chromium-widevine -version=59.0.3071.115 +version=62.0.3202.62 revision=1 short_desc="A browser plugin designed for the viewing of premium video content" maintainer="Benjamin Hoffmeyer " @@ -14,7 +14,7 @@ depends="chromium binutils xz" repository=nonfree create_wrksrc=yes distfiles="https://dl.google.com/linux/direct/google-chrome-${_channel}_${_chromeVersion}_amd64.deb" -checksum=a157db73f7fa09f884e665649b51518c2b0a9441465eca294c5562040a1058d9 +checksum=98a34a85ba0018d3897a8a11de9f29df08e77d64a9d991df66fcf5c5cdd957c6 do_extract() { : diff --git a/srcpkgs/clerk/template b/srcpkgs/clerk/template index bfc7ab23ba5..a8018fcd15c 100644 --- a/srcpkgs/clerk/template +++ b/srcpkgs/clerk/template @@ -1,7 +1,7 @@ # Template file for 'clerk' pkgname=clerk -version=3.2 -revision=2 +version=3.2.1 +revision=1 noarch=yes build_style=gnu-makefile conf_files="/etc/clerk.conf" @@ -11,7 +11,7 @@ maintainer="ibrokemypie " license="MIT" homepage="https://github.com/carnager/clerk/" distfiles="https://github.com/carnager/clerk/archive/${version}.tar.gz" -checksum=13ccdee926393942a2be697fc44d17e907f2a903522b843658607876e861dcf6 +checksum=954a388cce5a86c1760e130febc59b533651a01938b0c9a6b1f4941dda83db97 pre_build() { sed -i 's|share/doc/clerk/config.example|share/examples/clerk/config.example|' Makefile diff --git a/srcpkgs/clipgrab/template b/srcpkgs/clipgrab/template index 834fc7ede77..1f625b82590 100644 --- a/srcpkgs/clipgrab/template +++ b/srcpkgs/clipgrab/template @@ -1,6 +1,6 @@ # Template file for 'clipgrab' pkgname=clipgrab -version=3.6.5 +version=3.6.6 revision=1 build_style=qmake configure_args=clipgrab.pro @@ -12,7 +12,7 @@ maintainer="Juan RP " license="GPL-3" homepage="https://www.clipgrab.org" distfiles="https://download.clipgrab.org/clipgrab-${version}.tar.gz" -checksum=cc13512f2ca731b27d177d8f31780147d912ac8fc68a341748d53182811daade +checksum=c5c1d41d4392b95495fe1f5b9d1dd9a7b557dbd80445aafa928fe4e9b6948ece do_install() { vbin clipgrab diff --git a/srcpkgs/convmv/template b/srcpkgs/convmv/template new file mode 100644 index 00000000000..1fcecaf3c62 --- /dev/null +++ b/srcpkgs/convmv/template @@ -0,0 +1,11 @@ +# Template file for 'convmv' +pkgname=convmv +version=2.03 +revision=1 +build_style=gnu-makefile +short_desc="Tool for converting filesystem encodings" +maintainer="Arvin Ignaci " +license="GPL-2" +homepage="https://www.j3e.de/linux/convmv/" +distfiles="${homepage}/${pkgname}-${version}.tar.gz" +checksum=f898fd850c8ef5abe48f7536e4b23ce4e11b6133974b2fc41d9197dfecc1c027 diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template new file mode 100644 index 00000000000..4accd72d439 --- /dev/null +++ b/srcpkgs/coq/template @@ -0,0 +1,24 @@ +pkgname=coq +version=8.6.1 +revision=1 +hostmakedepends="ocaml ocaml-findlib camlp4" +short_desc="Proof assistant written in OCaml" +maintainer="Némo Fournier " +license="LGPL-2.1" +homepage="https://coq.inria.fr" +distfiles="${homepage}/distrib/V${version}/files/${pkgname}-${version}.tar.gz" +checksum=32f8aa92853483dec18030def9f0857a708fee56cf4287e39c9a260f08138f9d +nopie=yes +nocross=yes + +do_configure() { + ./configure -prefix ${DESTDIR}/usr -coqide no +} + +do_build() { + make +} + +do_install() { + make install +} diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template index 7e68f7436c3..ebf01c19fa2 100644 --- a/srcpkgs/cups-filters/template +++ b/srcpkgs/cups-filters/template @@ -1,7 +1,7 @@ # Template file for 'cups-filters' pkgname=cups-filters version=1.17.9 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static --with-rcdir=no --enable-avahi --with-browseremoteprotocols=DNSSD,CUPS" diff --git a/srcpkgs/cups/patches/cups-fix-install-perms.patch b/srcpkgs/cups/patches/cups-fix-install-perms.patch deleted file mode 100644 index bb85063747b..00000000000 --- a/srcpkgs/cups/patches/cups-fix-install-perms.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/Makedefs.in -+++ b/Makedefs.in -@@ -39,12 +39,12 @@ - # - - INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@ --INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@ -+INSTALL_COMPDATA = $(INSTALL) -c -m 644 @INSTALL_GZIP@ - INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@ --INSTALL_DATA = $(INSTALL) -c -m 444 -+INSTALL_DATA = $(INSTALL) -c -m 644 - INSTALL_DIR = $(INSTALL) -d - INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@ --INSTALL_MAN = $(INSTALL) -c -m 444 -+INSTALL_MAN = $(INSTALL) -c -m 644 - INSTALL_SCRIPT = $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ - - # diff --git a/srcpkgs/cups/patches/cups-no-gcrypt.patch b/srcpkgs/cups/patches/cups-no-gcrypt.patch deleted file mode 100644 index 0cd64b19187..00000000000 --- a/srcpkgs/cups/patches/cups-no-gcrypt.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up cups-2.0rc1/config-scripts/cups-ssl.m4.no-gcry cups-2.0rc1/config-scripts/cups-ssl.m4 ---- cups-2.0rc1/config-scripts/cups-ssl.m4.no-gcry 2014-09-12 15:41:23.324760213 +0200 -+++ cups-2.0rc1/config-scripts/cups-ssl.m4 2014-09-12 15:43:13.124203363 +0200 -@@ -60,7 +60,6 @@ if test x$enable_ssl != xno; then - dnl Then look for GNU TLS... - if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then - AC_PATH_TOOL(LIBGNUTLSCONFIG,libgnutls-config) -- AC_PATH_TOOL(LIBGCRYPTCONFIG,libgcrypt-config) - if $PKGCONFIG --exists gnutls; then - have_ssl=1 - SSLLIBS=`$PKGCONFIG --libs gnutls` diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template index b7905c48d28..f7f301b9aa3 100644 --- a/srcpkgs/cups/template +++ b/srcpkgs/cups/template @@ -1,14 +1,14 @@ # Template file for 'cups' pkgname=cups -version=2.2.4 -revision=2 +version=2.2.5 +revision=1 patch_args="-Np1" short_desc="Common Unix Printing System" maintainer="Juan RP " homepage="https://www.cups.org/" license="GPL-2" distfiles="https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz" -checksum=596d4db72651c335469ae5f37b0da72ac9f97d73e30838d787065f559dea98cc +checksum=a8795e2aa54dcfbdc9ff254a770f0d7154e35c981bca5b3369050c5193ab5a21 hostmakedepends="automake pkg-config poppler-utils gnutls-devel avahi-libs-devel" makedepends="acl-devel libjpeg-turbo-devel libpng-devel tiff-devel diff --git a/srcpkgs/cwm/template b/srcpkgs/cwm/template index 3181570218c..e0e584270f5 100644 --- a/srcpkgs/cwm/template +++ b/srcpkgs/cwm/template @@ -1,20 +1,18 @@ # Template file for 'cwm pkgname=cwm -version=5.6 -revision=3 +version=6.2 +revision=1 build_style=gnu-makefile hostmakedepends="pkg-config bison" makedepends="fontconfig-devel libXft-devel libXinerama-devel libXrandr-devel libX11-devel" short_desc="Lightweight and efficient window manager for X11" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="ISC" -homepage="http://www.openbsd.org/cgi-bin/man.cgi?query=cwm&manpath=OpenBSD+Current&format=html" +homepage="http://man.openbsd.org/cwm" distfiles="https://github.com/chneukirchen/cwm/archive/v${version}.tar.gz" -checksum="006320bb1716cc0f93bac5634dcccd01f21d468263b5fc9d1be2dd11078a0625" -replaces="cwm-git>=0" +checksum=3d21efeaeeb4f02cb84ee123c7d40766086785ad46720125fe0bacdb251413ad post_extract() { - sed -i 's,WAIT_ANY,-1,g' *.c sed -i 's/^\(LD\|CPP\)FLAGS/override &/' Makefile sed '/\*\//q' calmwm.c >LICENSE } diff --git a/srcpkgs/dconf-editor/template b/srcpkgs/dconf-editor/template index b1c5930b9d6..0d6866f0bf5 100644 --- a/srcpkgs/dconf-editor/template +++ b/srcpkgs/dconf-editor/template @@ -1,13 +1,13 @@ # Template file for 'dconf-editor' pkgname=dconf-editor -version=3.22.3 +version=3.26.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel" makedepends="dconf-devel gtk+3-devel libxml2-devel" short_desc="A low-level configuration system - GTK+ editor" maintainer="Enno Boland " -license="LGPL-2.1" +license="GPL-3" homepage="http://live.gnome.org/dconf" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=55f167d7e61714766406b23d7222d509f7bb98b9df1a367113ac14ea06f669a4 +checksum=49332042a4c9a46ad6345055bb098c8701cbca7bc39ec9a9fd6e49b87ef1ea29 diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template index 95c0a73d266..2ad81c7ed52 100644 --- a/srcpkgs/dconf/template +++ b/srcpkgs/dconf/template @@ -1,6 +1,6 @@ # Template file for 'dconf' pkgname=dconf -version=0.26.0 +version=0.26.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="http://live.gnome.org/dconf" license="LGPL-2.1" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=8683292eb31a3fae31e561f0a4220d8569b0f6d882e9958b68373f9043d658c9 +checksum=d583b1f7fc93b879e2956acc6a26ea05a445a0002158aeef80c8e378e1414535 dconf-devel_package() { depends="libglib-devel vala-devel>=0.24 dconf>=${version}_${revision}" diff --git a/srcpkgs/dep/template b/srcpkgs/dep/template index 8b23f35d325..ebb643dd9f3 100644 --- a/srcpkgs/dep/template +++ b/srcpkgs/dep/template @@ -1,6 +1,6 @@ # Template file for 'dep' pkgname=dep -version=0.3.1 +version=0.3.2 revision=1 build_style=go hostmakedepends="git" @@ -12,7 +12,7 @@ go_import_path="github.com/golang/dep" go_package="$go_import_path/cmd/dep" homepage="https://$go_import_path" distfiles="$homepage/archive/v$version.tar.gz" -checksum=386e2d163c5a95166fa3b89da4f8166361c7c5210fb172f64c116cccd19d1d44 +checksum=327124953d76293eaba6001e17bb8a31371313ab39eed1fa9eac01f8b5c1de21 pre_build() { git config --global http.https://gopkg.in.followRedirects true diff --git a/srcpkgs/devilspie2/template b/srcpkgs/devilspie2/template index fcd19726840..1b54cc2fc50 100644 --- a/srcpkgs/devilspie2/template +++ b/srcpkgs/devilspie2/template @@ -1,6 +1,6 @@ # Template file for 'devilspie2' pkgname=devilspie2 -version=0.42 +version=0.43 revision=1 build_style=gnu-makefile hostmakedepends="pkg-config" @@ -10,4 +10,4 @@ maintainer="Diogo Leal " license="GPL-3" homepage="http://www.gusnan.se/devilspie2" distfiles="http://download.savannah.gnu.org/releases/devilspie2/devilspie2_${version}-src.tar.gz" -checksum=11f5bc310fba4df404c057461ffb3fadac8ef51d211008c665c48f587a5a3f85 +checksum=ecffc17c62b41e196b72340192a90c4223329df041f135e74c0990860595f828 diff --git a/srcpkgs/dhcpcd-gtk/template b/srcpkgs/dhcpcd-gtk/template index 77f0e92d6df..b82dae95e1a 100644 --- a/srcpkgs/dhcpcd-gtk/template +++ b/srcpkgs/dhcpcd-gtk/template @@ -1,7 +1,7 @@ # Template file for 'dhcpcd-gtk' pkgname=dhcpcd-gtk -version=0.7.4 -revision=2 +version=0.7.5 +revision=1 wrksrc=dhcpcd-ui-${version} build_style=gnu-configure configure_args="--with-gtk --with-icons --with-notification" @@ -13,7 +13,7 @@ homepage="http://roy.marples.name/projects/dhcpcd-ui" license="BSD" maintainer="Juan RP " distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-ui-$version.tar.bz2" -checksum=19f02d4428773d37fc6dcd28ddc685c83fa0b15ed693c26276f2e1d8d4fda883 +checksum=2dae2108605867aba78d98cc9e56e22d7b751eedc3f7e6d689d42d08e706aaf3 dhcpcd-icons_package() { noarch=yes diff --git a/srcpkgs/dosbox/template b/srcpkgs/dosbox/template index 8e2d603bdd0..bbf05a8e06b 100644 --- a/srcpkgs/dosbox/template +++ b/srcpkgs/dosbox/template @@ -1,14 +1,14 @@ # Template file for 'dosbox' pkgname=dosbox version=0.74 -revision=6 +revision=7 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="alsa-lib-devel libpng-devel SDL_net-devel SDL_sound-devel" -short_desc="x86 emulator with Tandy/Herc/CGA/EGA/VGA/SVGA graphics, sound and DOS" +short_desc="DOS x86 emulator with Tandy/Herc/CGA/EGA/VGA/SVGA graphics and sound" maintainer="Juan RP " license="GPL-2" -homepage="http://dosbox.sourceforget.net" +homepage="http://www.dosbox.com" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=13f74916e2d4002bad1978e55727f302ff6df3d9be2f9b0e271501bd0a938e05 diff --git a/srcpkgs/dpkg/template b/srcpkgs/dpkg/template index 719fbd3b4e4..45cbd413f06 100644 --- a/srcpkgs/dpkg/template +++ b/srcpkgs/dpkg/template @@ -1,6 +1,6 @@ # Template file for 'dpkg' pkgname=dpkg -version=1.18.24 +version=1.19.0.2 revision=1 build_style=gnu-configure configure_args="--disable-start-stop-daemon --with-libz --with-libbz2 --with-liblzma" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://packages.debian.org/dpkg" distfiles="${DEBIAN_SITE}/main/d/dpkg/dpkg_${version}.tar.xz" -checksum=d853081d3e06bfd46a227056e591f094e42e78fa8a5793b0093bad30b710d7b4 +checksum=1436cd75d3910e32d1366fff9b1ec7cfb154bc0d63c035e22dba76fdd06ad6a2 dpkg-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template index f7ed2ca86f9..0633db4eef3 100644 --- a/srcpkgs/e2fsprogs/template +++ b/srcpkgs/e2fsprogs/template @@ -1,13 +1,13 @@ # Template file for 'e2fsprogs' pkgname=e2fsprogs -version=1.43.6 +version=1.43.7 revision=1 short_desc="Ext2/3/4 Filesystem Utilities" maintainer="Juan RP " license="GPL-2, LGPL-2.1" homepage="http://e2fsprogs.sourceforge.net/" distfiles="${KERNEL_SITE}/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz" -checksum=c9b226234ee878a8d89951f3b155cec7416dd0ec09c932c855f1b1df8ad93402 +checksum=2a6367289047d68d9ba6a46cf89ab9a1efd0556cde02a51ebaf414ff51edded9 build_style=gnu-configure configure_args="--enable-elf-shlibs --disable-fsck diff --git a/srcpkgs/efibootmgr/patches/efibootmgr_default_to_grub2.patch b/srcpkgs/efibootmgr/patches/efibootmgr_default_to_grub2.patch index c143293545f..4245c033312 100644 --- a/srcpkgs/efibootmgr/patches/efibootmgr_default_to_grub2.patch +++ b/srcpkgs/efibootmgr/patches/efibootmgr_default_to_grub2.patch @@ -1,23 +1,19 @@ ---- src/efibootmgr.c 2016-09-27 23:00:36.000000000 +0200 -+++ src/efibootmgr.c 2017-02-18 03:38:27.121886861 +0100 -@@ -1199,8 +1199,8 @@ - printf("\t --ip-port , set local and remote IP ports\n"); +--- src/efibootmgr.c ++++ src/efibootmgr.c +@@ -1239,7 +1239,7 @@ usage() printf("\t --ip-origin { {dhcp|static} | { static|stateless|stateful} }\n"); #endif -- printf("\t-l | --loader name (defaults to \\EFI\\redhat\\grub.efi)\n"); + printf("\t-l | --loader name (defaults to \""DEFAULT_LOADER"\")\n"); - printf("\t-L | --label label Boot manager display label (defaults to \"Linux\")\n"); -+ printf("\t-l | --loader name (defaults to \\EFI\\void\\grubx64.efi)\n"); + printf("\t-L | --label label Boot manager display label (defaults to \"Void Linux (GRUB2)\")\n"); printf("\t-m | --mirror-below-4G t|f mirror memory below 4GB\n"); printf("\t-M | --mirror-above-4G X percentage memory to mirror above 4GB\n"); printf("\t-n | --bootnext XXXX set BootNext to XXXX (hex)\n"); -@@ -1229,8 +1229,8 @@ - opts.active = -1; /* Don't set it */ +@@ -1269,7 +1269,7 @@ set_default_opts() opts.timeout = -1; /* Don't set it */ opts.edd10_devicenum = 0x80; -- opts.loader = "\\EFI\\redhat\\grub.efi"; + opts.loader = DEFAULT_LOADER; - opts.label = (unsigned char *)"Linux"; -+ opts.loader = "\\EFI\\void\\grubx64.efi"; + opts.label = (unsigned char *)"Void Linux (GRUB2)"; opts.disk = "/dev/sda"; opts.part = 1; diff --git a/srcpkgs/efibootmgr/patches/gcc7-duplicate-const.patch b/srcpkgs/efibootmgr/patches/gcc7-duplicate-const.patch deleted file mode 100644 index cb222a2cec4..00000000000 --- a/srcpkgs/efibootmgr/patches/gcc7-duplicate-const.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- src/efibootdump.c 2016-09-27 23:00:36.000000000 +0200 -+++ src/efibootdump.c 2017-05-09 12:33:41.756321719 +0200 -@@ -39,7 +39,7 @@ - uint8_t *optional_data = NULL; - size_t optional_data_len = 0; - uint16_t pathlen; -- const unsigned char const *desc; -+ const unsigned char *desc; - char *raw; - size_t raw_len; - ---- src/efibootmgr.c 2017-05-09 12:32:45.939316598 +0200 -+++ src/efibootmgr.c 2017-05-09 12:34:02.281323682 +0200 -@@ -221,7 +221,7 @@ - list_t *pos; - var_entry_t *entry; - efi_load_option *load_option; -- const unsigned char const *desc; -+ const unsigned char *desc; - - list_for_each(pos, var_list) { - entry = list_entry(pos, var_entry_t, list); -@@ -873,7 +873,7 @@ - { - list_t *pos; - var_entry_t *boot; -- const unsigned char const *description; -+ const unsigned char *description; - efi_load_option *load_option; - efidp dp = NULL; - unsigned char *optional_data = NULL; diff --git a/srcpkgs/efibootmgr/template b/srcpkgs/efibootmgr/template index e3aed0c487d..a53a0cf6494 100644 --- a/srcpkgs/efibootmgr/template +++ b/srcpkgs/efibootmgr/template @@ -1,7 +1,7 @@ # Template file for 'efibootmgr' pkgname=efibootmgr -version=14 -revision=3 +version=15 +revision=1 hostmakedepends="pkg-config" makedepends="libefivar-devel zlib-devel pciutils-devel" short_desc="Tool to modify UEFI Firmware Boot Manager Variables" @@ -9,14 +9,21 @@ maintainer="Juan RP " license="GPL-2" homepage="https://github.com/rhinstaller/efibootmgr" distfiles="https://github.com/rhinstaller/efibootmgr/releases/download/${version}/${pkgname}-${version}.tar.bz2" -checksum=377ec16484414b80afd1b8a586153d7ef55ccf048638080101d49b7c77f37ad8 +checksum=2081add77eb0641805386acd0a0fbbe6dbfb71831b814507ef49087f748333f9 only_for_archs="i686 i686-musl x86_64 x86_64-musl" conf_files="/etc/default/efibootmgr-kernel-hook" CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/efivar" +case "$XBPS_TARGET_MACHINE" in + x86_64*) + EFI_LOADER="grubx64.efi" ;; + i686*) + EFI_LOADER="grub.efi" ;; +esac + do_build() { - make EXTRA_CFLAGS="$CFLAGS" ${makejobs} + make EXTRA_CFLAGS="$CFLAGS" ${makejobs} EFIDIR="void" EFI_LOADER="${EFI_LOADER}" } do_install() { vbin src/efibootdump diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template index 6b1071cef47..656cb43b907 100644 --- a/srcpkgs/efl/template +++ b/srcpkgs/efl/template @@ -1,7 +1,7 @@ # Template file for 'efl' pkgname=efl version=1.20.4 -revision=1 +revision=3 build_style=gnu-configure configure_args="CXX= --enable-multisense --enable-image-loader-webp --enable-liblz4 --disable-systemd $(vopt_enable framebuffer fb) $(vopt_enable pulseaudio) diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template index f8f1c8d139e..54a3c72355f 100644 --- a/srcpkgs/eog-plugins/template +++ b/srcpkgs/eog-plugins/template @@ -1,6 +1,6 @@ # Template file for 'eog-plugins' pkgname=eog-plugins -version=3.26.0 +version=3.26.1 revision=1 lib32disabled=yes build_style=gnu-configure @@ -15,4 +15,4 @@ maintainer="Enno Boland " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=875175812bebb0ae69a89e85ea927a0a5cc9a89be22484cca0233ef5ca879cd0 +checksum=a73d0dc7a9190781f65d3132e0b1e13b666e13a1591a7cf97c1e9835aa70856c diff --git a/srcpkgs/eog/patches/fix-markdown-itstool.patch b/srcpkgs/eog/patches/fix-markdown-itstool.patch new file mode 100644 index 00000000000..f8a1d9666dc --- /dev/null +++ b/srcpkgs/eog/patches/fix-markdown-itstool.patch @@ -0,0 +1,50 @@ +--- help/lv/lv.po ++++ help/lv/lv.po +@@ -1807,7 +1807,7 @@ msgid "" + "check Slideshow Shuffle and close the dialog." + msgstr "" + "Lai to izdarītu, atveriet lietotnes izvēlni augšējā joslā, spiediet uz Iestatījumi, ejiet uz cilni Spraudņi un" ++" style=\"menuitem\">Iestatījumi, ejiet uz cilni Spraudņi un" + " atzīmējiet Slīdrādes maisītājs un aizveriet dialoglodziņu." + + #. (itstool) path: info/desc +--- help/es/es.po ++++ help/es/es.po +@@ -631,7 +631,7 @@ msgid "" + "\"menuitem\">Save." + msgstr "" + "Si quiere mantener la imagen volteada así, pulse Guardar." ++"\">Guardar." + + #. (itstool) path: item/p + #: C/flip-rotate.page:33 C/flip-rotate.page:46 +@@ -742,7 +742,7 @@ msgid "" + "Click Save As…. The Save Image " + "window will pop up." + msgstr "" +-"Pulse Guardar como. Se mostrará la " ++"Pulse Guardar como. Se mostrará la " + "ventana emergente Guardar imagen." + + #. (itstool) path: item/p +@@ -1370,7 +1370,7 @@ msgid "" + "\"menuitem\">Preferences and go to the Plugins tab. Then, " + "check Date in statusbar." + msgstr "" +-"Para ello, pulse Preferencias y vaya a la " ++"Para ello, pulse Preferencias y vaya a la " + "pestaña Complementos. Después, marque Fecha en la barra de " + "estado." + +@@ -2888,7 +2888,7 @@ msgstr "Abra una de las imágenes de la carpeta." + #| "F5." + msgid "Click Slideshow or press F5." + msgstr "" +-"Pulse Diapositivas o pulse F5." ++"Pulse Diapositivas o pulse F5." + + #. (itstool) path: item/p + #: C/slideshow.page:33 + diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template index 6d7a6f23891..404b460616b 100644 --- a/srcpkgs/eog/template +++ b/srcpkgs/eog/template @@ -1,6 +1,6 @@ # Template file for 'eog' pkgname=eog -version=3.26.0 +version=3.26.1 revision=1 lib32disabled=yes build_style=gnu-configure @@ -17,7 +17,7 @@ maintainer="Enno Boland " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/eog/${version%.*}/eog-$version.tar.xz" -checksum=e0e16210dfc5cd34327fff2874d8c54d64eb4ab9ad903d4f8218b10d77126095 +checksum=98dbeb535bc55a818ce544267ee50202a7b2fb971c8ae5965799445543febc88 if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index 9ec528f70b7..dcc31b28000 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,6 +1,6 @@ # Template file for 'epiphany' pkgname=epiphany -version=3.26.0 +version=3.26.1 revision=1 build_style=meson configure_args="-Ddistributor_name=VoidLinux -Dunit_tests=false" @@ -18,4 +18,4 @@ maintainer="Enno Boland " homepage="http://www.gnome.org/projects/epiphany/" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=37956cbec3b4feda8b18f48e250ca50a904a9ed528433c812eca52be0e828879 +checksum=3d2bc72145d0ee6375ae857a3707aae97975df579a1be944bb59881fc46caf85 diff --git a/srcpkgs/esmtool b/srcpkgs/esmtool new file mode 120000 index 00000000000..b54e95dedd1 --- /dev/null +++ b/srcpkgs/esmtool @@ -0,0 +1 @@ +openmw \ No newline at end of file diff --git a/srcpkgs/evolution-data-server/files/disableRuntimeTests.cmake b/srcpkgs/evolution-data-server/files/disableRuntimeTests.cmake new file mode 100644 index 00000000000..14d48ed6143 --- /dev/null +++ b/srcpkgs/evolution-data-server/files/disableRuntimeTests.cmake @@ -0,0 +1,39 @@ +# This file was generated by CMake because it detected TRY_RUN() commands +# in crosscompiling mode. It will be overwritten by the next CMake run. +# Copy it to a safe location, set the variables to appropriate values +# and use it then to preset the CMake cache (using -C). + + +# _correct_iconv_EXITCODE +# indicates whether the executable would have been able to run on its +# target platform. If so, set _correct_iconv_EXITCODE to +# the exit code (in many cases 0 for success), otherwise enter "FAILED_TO_RUN". +# The _correct_iconv_COMPILED variable holds the build result for this TRY_RUN(). +# +# Source file : /builddir/evolution-data-server-3.26.0/build/CMakeFiles/CMakeTmp/src.c +# Executable : /builddir/evolution-data-server-3.26.0/build/CMakeFiles/cmTC_315ee-_correct_iconv_EXITCODE +# Run arguments : +# Called from: [2] /usr/share/cmake-3.9/Modules/CheckCSourceRuns.cmake +# [1] /builddir/evolution-data-server-3.26.0/CMakeLists.txt + +set( _correct_iconv_EXITCODE + 0 + CACHE INTERNAL "Result from TRY_RUN" FORCE) + + +# HAVE_LKSTRFTIME_EXITCODE +# indicates whether the executable would have been able to run on its +# target platform. If so, set HAVE_LKSTRFTIME_EXITCODE to +# the exit code (in many cases 0 for success), otherwise enter "FAILED_TO_RUN". +# The HAVE_LKSTRFTIME_COMPILED variable holds the build result for this TRY_RUN(). +# +# Source file : /builddir/evolution-data-server-3.26.0/build/CMakeFiles/CMakeTmp/src.c +# Executable : /builddir/evolution-data-server-3.26.0/build/CMakeFiles/cmTC_d2897-HAVE_LKSTRFTIME_EXITCODE +# Run arguments : +# Called from: [2] /usr/share/cmake-3.9/Modules/CheckCSourceRuns.cmake +# [1] /builddir/evolution-data-server-3.26.0/CMakeLists.txt + +set( HAVE_LKSTRFTIME_EXITCODE + 0 + CACHE INTERNAL "Result from TRY_RUN" FORCE) + diff --git a/srcpkgs/evolution-data-server/files/iconv-detect.h b/srcpkgs/evolution-data-server/files/iconv-detect.h new file mode 100644 index 00000000000..46f476d5bc9 --- /dev/null +++ b/srcpkgs/evolution-data-server/files/iconv-detect.h @@ -0,0 +1,5 @@ +/* This is an auto-generated header, DO NOT EDIT! */ + +#define ICONV_ISO_D_FORMAT "iso-%d-%d" +#define ICONV_ISO_S_FORMAT "iso-%d-%s" +#define ICONV_10646 "iso-10646" diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index 904b4256246..5aa6ce8dbdc 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,6 +1,6 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server -version=3.26.0 +version=3.26.1 revision=1 build_style=cmake configure_args="-DENABLE_GOOGLE_AUTH=OFF -DENABLE_UOA=OFF" @@ -14,8 +14,7 @@ maintainer="Enno Boland " license="GPL-2" homepage="https://wiki.gnome.org/Apps/Evolution" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=7776ef431e58a07b32e5b678b8df4ae5e85f99003a933dafa6bb73842ccff067 -nocross=yes +checksum=ea207a3abd5e7bb8ccaa88741de7715a128083efdf8296af2c3a2fb8d072a4b3 build_options="gir" if [ -z "$CROSS_BUILD" ]; then @@ -26,15 +25,23 @@ if [ ! -z "$build_option_gir" ]; then configure_args+=" -DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON" fi +# cmake perfomrms 2 checks using binary runtime, about iconv and sfrtime. +# musl (1.1.16) does not support "ISO-2022-JP" encoding (see its roadmap), +# although evolution-data-server is fine with musl. +# If crossbuild, cmake let disabling runtime checks via specific directives. +# test iconv-detect.c also generates iconv-detect.h that is required for build. +# So completly disable test from iconv-detect.c (cmake.patch file) and +# use a cmake cache file on crossbuild to disable sfrtime running test. +if [ "$CROSS_BUILD" ]; then + configure_args+=" -C disableRuntimeTests.cmake" +fi + pre_configure() { - if [ ! -d "build" ]; then - mkdir build + mkdir -p build + cp ${FILESDIR}/iconv-detect.h ${wrksrc}/build/. + if [ "$CROSS_BUILD" ]; then + cp ${FILESDIR}/disableRuntimeTests.cmake ${wrksrc}/build/. fi - echo '/* This is an auto-generated header, DO NOT EDIT! */' > build/iconv-detect.h - echo >> build/iconv-detect.h - echo '#define ICONV_ISO_D_FORMAT "iso-%d-%d"' >> build/iconv-detect.h - echo '#define ICONV_ISO_S_FORMAT "iso-%d-%s"' >> build/iconv-detect.h - echo '#define ICONV_10646 "iso-10646"' >> build/iconv-detect.h } post_install() { # Fix broken pkg-config diff --git a/srcpkgs/evolution-data-server/update b/srcpkgs/evolution-data-server/update deleted file mode 100644 index a84fbbad8b1..00000000000 --- a/srcpkgs/evolution-data-server/update +++ /dev/null @@ -1,2 +0,0 @@ -site="${GNOME_SITE}/$pkgname/cache.json" -ignore="3.*[13579].*" diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index a4dbda05d86..6fad4b603de 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,6 +1,6 @@ # Template file for 'evolution' pkgname=evolution -version=3.26.0 +version=3.26.1 revision=1 build_style=cmake configure_args="-DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF @@ -18,7 +18,7 @@ maintainer="Enno Boland " license="GPL-2" homepage="https://wiki.gnome.org/Apps/Evolution" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=ccdacab9ab32299c834dd786c1ba9c5f7f27d0a7e8c4d3cbd260e416aafeb176 +checksum=77cab4d82732d82b875b2ace4cd9d4ff0ddd6ed1aa1bed34836b9fd40776eeaf evolution-devel_package() { depends="GConf-devel gtkhtml-devel>=4.6.0 evolution-data-server-devel diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template index 77cfac4595a..a9cb3ceb298 100644 --- a/srcpkgs/exiftool/template +++ b/srcpkgs/exiftool/template @@ -1,6 +1,6 @@ # Template file for 'exiftool' pkgname=exiftool -version=10.63 +version=10.64 revision=1 noarch=yes wrksrc="Image-ExifTool-${version}" @@ -13,4 +13,4 @@ maintainer="Juan RP " homepage="http://www.sno.phy.queensu.ca/~phil/exiftool/" license="Artistic, GPL-1" distfiles="http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-${version}.tar.gz" -checksum=84d63972e9172cd18fce54fef862f0d818c91c29a79c95689557be31747b9fde +checksum=1632a684fa93bc1051f3ffab9cf9453c2b5e29173afd8b91b1044e4def8c42c9 diff --git a/srcpkgs/exiv2/template b/srcpkgs/exiv2/template index ea6259dc6be..4c442469310 100644 --- a/srcpkgs/exiv2/template +++ b/srcpkgs/exiv2/template @@ -11,6 +11,7 @@ license="GPL-2" homepage="http://www.exiv2.org" distfiles="http://www.exiv2.org/builds/exiv2-${version}-trunk.tar.gz" checksum=c75e3c4a0811bf700d92c82319373b7a825a2331c12b8b37d41eb58e4f18eafb +disable_parallel_build=yes exiv2-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}" diff --git a/srcpkgs/expect/template b/srcpkgs/expect/template index c6d7e197b0b..1f679a937a2 100644 --- a/srcpkgs/expect/template +++ b/srcpkgs/expect/template @@ -1,16 +1,16 @@ # Template file for 'expect' pkgname=expect -version=5.45 -revision=4 +version=5.45.3 +revision=1 wrksrc=${pkgname}${version} build_style=gnu-configure makedepends="tcl-devel" short_desc="Programmed dialogue with interactive programs" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="Public Domain" homepage="http://www.nist.gov/el/msid/expect.cfm" distfiles="${SOURCEFORGE_SITE}/${pkgname}/Expect/${version}/${pkgname}${version}.tar.gz" -checksum=b28dca90428a3b30e650525cdc16255d76bb6ccd65d448be53e620d95d5cc040 +checksum=c520717b7195944a69ce1492ec82ca0ac3f3baf060804e6c5ee6d505ea512be9 nocross=yes LDFLAGS+=" -Wl,-rpath=/usr/lib:/usr/lib/${pkgname}${version}" diff --git a/srcpkgs/eyeD3/template b/srcpkgs/eyeD3/template index f3889911c25..981c2573bd8 100644 --- a/srcpkgs/eyeD3/template +++ b/srcpkgs/eyeD3/template @@ -1,7 +1,7 @@ # Template file for 'eyeD3' pkgname=eyeD3 version=0.7.10 -revision=1 +revision=2 noarch=yes build_style=python2-module hostmakedepends="python-setuptools" @@ -13,3 +13,7 @@ license="GPL-2" maintainer="Juan RP " distfiles="${homepage}/releases/${pkgname}-${version}.tar.gz" checksum=98a7d249136e845eb5469866657160f623d0a44f602e59bc907a12a3bf665172 + +post_install() { + sed -i 's/python/python2/' ${DESTDIR}/usr/bin/eyeD3 +} diff --git a/srcpkgs/faad2/template b/srcpkgs/faad2/template index 6500dedd8e0..ef79eb766eb 100644 --- a/srcpkgs/faad2/template +++ b/srcpkgs/faad2/template @@ -1,6 +1,6 @@ # Template file for 'faad2' pkgname=faad2 -version=2.8.1 +version=2.8.6 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" @@ -8,15 +8,8 @@ short_desc="AAC decoding library" maintainer="Juan RP " homepage="http://www.audiocoding.com/" license="GPL-2" -distfiles="${SOURCEFORGE_SITE}/faac/$pkgname-$version.tar.bz2" -checksum=f4042496f6b0a60f5ded6acd11093230044ef8a2fd965360c1bbd5b58780933d - -pre_configure() { - case "$XBPS_TARGET_MACHINE" in - *-musl) export CFLAGS+=" -D__GNU_LIBRARY__";; - esac - ./bootstrap -} +distfiles="${SOURCEFORGE_SITE}/faac/$pkgname-$version.tar.gz" +checksum=654977adbf62eb81f4fca00152aca58ce3b6dd157181b9edd7bed687a7c73f21 faad2-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/fd/template b/srcpkgs/fd/template index 9467a4535f3..a65f4e7cb5c 100644 --- a/srcpkgs/fd/template +++ b/srcpkgs/fd/template @@ -1,6 +1,6 @@ # Template file for 'fd' pkgname=fd -version=3.1.0 +version=4.0.0 revision=1 hostmakedepends="rust cargo" short_desc="A simple, fast and user-friendly alternative to find" @@ -8,7 +8,7 @@ maintainer="Jerry Tegno " license="MIT" homepage="https://github.com/sharkdp/fd" distfiles="https://github.com/sharkdp/${pkgname}/archive/v${version}.tar.gz" -checksum=03f35f808d4d4a7a5767ba791f259653edab0b9f6829233e98fd617f78a3faaf +checksum=e564a11ad1beb8979b45d11ee592ed9a633fabf445eec0c766d87857b46bb636 nocross=yes do_build() { diff --git a/srcpkgs/ffms2/template b/srcpkgs/ffms2/template new file mode 100644 index 00000000000..ef44c763f77 --- /dev/null +++ b/srcpkgs/ffms2/template @@ -0,0 +1,49 @@ +# Template file for 'ffms2' +pkgname=ffms2 +version=2.23.1 +revision=1 +_version=2.23 +wrksrc="${pkgname}-${_version}" +build_style=gnu-configure +configure_args="--enable-shared --disable-static" +hostmakedepends="pkg-config" +makedepends="ffmpeg-devel zlib-devel" +short_desc="A libav/ffmpeg based frames server" +maintainer="DirectorX " +license="MIT, GPL-3" +homepage="https://github.com/FFMS/ffms2" +distfiles="${homepage}/archive/${_version}.tar.gz" +checksum=b09b2aa2b1c6f87f94a0a0dd8284b3c791cbe77f0f3df57af99ddebcd15273ed + +post_install() { + vmkdir usr/lib/vapoursynth + pushd "$DESTDIR/usr/lib/vapoursynth" + ln -sr $(ls ../libffms2.so.*.* | head -1) libffms2.so + popd + vlicense COPYING +} + + +libffms2-devel_package() { + depends="libffms2>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} + +libffms2_package() { + short_desc+=" - runtime library" + pkg_install() { + vmove "usr/lib/*.so.*" + } +} + +vapoursynth-ffms2-source_package() { + depends="libffms2>=${version}_${revision}" + pkg_install() { + vmove usr/lib/vapoursynth + } +} diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template index 3282eb079c4..0c0c11ffb90 100644 --- a/srcpkgs/file-roller/template +++ b/srcpkgs/file-roller/template @@ -1,6 +1,6 @@ # Template file for 'file-roller' pkgname=file-roller -version=3.26.0 +version=3.26.1 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --enable-magic --disable-static" @@ -12,4 +12,4 @@ maintainer="Enno Boland " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=75147fe2439178b01e70ca5d7abe10b05e7500249eeaa3caf5d86df94c2afd60 +checksum=ecd5e4c9b8435a6515120c59efeed196ec3f07cb84e1bbda7534cb5456e491ae diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template index 28fb35906da..6fb2b234b6e 100644 --- a/srcpkgs/firefox-esr/template +++ b/srcpkgs/firefox-esr/template @@ -1,6 +1,6 @@ # Template build file for 'firefox-esr'. pkgname=firefox-esr -version=52.4.0 +version=52.4.1 revision=1 wrksrc="firefox-${version}esr" short_desc="Mozilla Firefox web browser - Extended Support Release (ESR)" @@ -8,7 +8,7 @@ maintainer="Eivind Uggedal " homepage="https://www.mozilla.org/firefox/" license="MPL-2.0, GPL-2, LGPL-2.1" distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz" -checksum=58ae7cb6c2fb81d22762ab3c60e46cadbe7c5b687f24c2823d9533ec998a21ee +checksum=96fab11b7e5bd016f80718161ee8dd8afdf989a2cd03106a148b15def2569457 only_for_archs="i686 i686-musl x86_64 x86_64-musl" nopie=yes diff --git a/srcpkgs/fortune-mod-void/files/void b/srcpkgs/fortune-mod-void/files/void index ce56bc3881b..0bdf2e2e53f 100644 --- a/srcpkgs/fortune-mod-void/files/void +++ b/srcpkgs/fortune-mod-void/files/void @@ -154,3 +154,11 @@ chris2: I'm somewhat tempted to propose AF_TWITTER - halfwit, you live in america's hat? I knew it! % +23:25 by the power of ansible I declare these builders to + be [ONLINE] +23:28 * Vaelatern imagines maldridge in a wizard's cloak, waving a + magic wand inscribed with the bluetooth symbol, as banks of displays + behind him show splash screens and begin showing multicoloured graphs +23:29 http://198.204.250.219:19999/ + +% diff --git a/srcpkgs/freeipmi/patches/fix-build-with-C99-compilers.patch b/srcpkgs/freeipmi/patches/fix-build-with-C99-compilers.patch new file mode 100644 index 00000000000..c88a00f4f4d --- /dev/null +++ b/srcpkgs/freeipmi/patches/fix-build-with-C99-compilers.patch @@ -0,0 +1,69 @@ +Source: http://lists.busybox.net/pipermail/buildroot/2016-September/172879.html + +"The issue is that C99 changed inline semantics. This patch takes these +changes into account and allows to build the bundled argp and therefore +[freeipmi] with non-C89-compilers." + +--- common/portability/freeipmi-argp-fmtstream.c.orig 2017-08-16 20:28:19.000000000 +0200 ++++ common/portability/freeipmi-argp-fmtstream.c 2017-10-19 15:53:41.419508328 +0200 +@@ -389,6 +389,7 @@ + weak_alias (__argp_fmtstream_printf, argp_fmtstream_printf) + #endif + ++#if __STDC_VERSION__ - 199900L < 1 + /* Duplicate the inline definitions in argp-fmtstream.h, for compilers + * that don't do inlining. */ + size_t +@@ -471,5 +472,6 @@ + __argp_fmtstream_update (__fs); + return __fs->point_col >= 0 ? __fs->point_col : 0; + } ++#endif /* __STDC_VERSION__ - 199900L < 1 */ + + #endif /* !ARGP_FMTSTREAM_USE_LINEWRAP */ +--- common/portability/freeipmi-argp-fmtstream.h.orig 2017-08-16 20:28:19.000000000 +0200 ++++ common/portability/freeipmi-argp-fmtstream.h 2017-10-19 15:58:36.245170810 +0200 +@@ -145,6 +145,7 @@ + __const char *__fmt, ...) + PRINTF_STYLE(2,3); + ++#if __STDC_VERSION__ - 199900L < 1 + extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); + extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); + +@@ -155,6 +156,7 @@ + __const char *__str, size_t __len); + extern size_t argp_fmtstream_write (argp_fmtstream_t __fs, + __const char *__str, size_t __len); ++#endif /* __STDC_VERSION__ - 199900L < 1 */ + + /* Access macros for various bits of state. */ + #define argp_fmtstream_lmargin(__fs) ((__fs)->lmargin) +@@ -164,6 +166,7 @@ + #define __argp_fmtstream_rmargin argp_fmtstream_rmargin + #define __argp_fmtstream_wmargin argp_fmtstream_wmargin + ++#if __STDC_VERSION__ - 199900L < 1 + /* Set __FS's left margin to LMARGIN and return the old value. */ + extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs, + size_t __lmargin); +@@ -185,6 +188,7 @@ + /* Return the column number of the current output point in __FS. */ + extern size_t argp_fmtstream_point (argp_fmtstream_t __fs); + extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs); ++#endif /* __STDC_VERSION__ - 199900L < 1 */ + + /* Internal routines. */ + extern void _argp_fmtstream_update (argp_fmtstream_t __fs); +@@ -208,7 +212,11 @@ + #endif + + #ifndef ARGP_FS_EI ++#if defined(__GNUC__) && !defined(__GNUC_STDC_INLINE__) + #define ARGP_FS_EI extern inline ++#else ++#define ARGP_FS_EI inline ++#endif + #endif + + ARGP_FS_EI size_t diff --git a/srcpkgs/freeipmi/template b/srcpkgs/freeipmi/template index e26d05b6d6c..72675b91ec1 100644 --- a/srcpkgs/freeipmi/template +++ b/srcpkgs/freeipmi/template @@ -1,7 +1,7 @@ # Template file for 'freeipmi' pkgname=freeipmi version=1.5.7 -revision=1 +revision=2 build_style=gnu-configure configure_args="--without-systemdsystemunitdir ac_cv_header_sys_stropts_h=no" conf_files="/etc/freeipmi/*.conf" @@ -17,7 +17,6 @@ checksum=b46c9432e8649b87d4646bbf4da32f7e9039796fc256f4b229c94c3ac7d0bde5 case "$XBPS_TARGET_MACHINE" in aarch64) configure_args+=" ac_cv_header_sys_io_h=no";; -*-musl) broken="Bunches of freeipmi-argp-namefrob.h:62:32: error: redefinition of 'argp_fmtstream_write'" esac post_install() { diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template index d41e1a7b25a..1deeeecc69c 100644 --- a/srcpkgs/freeplane/template +++ b/srcpkgs/freeplane/template @@ -1,6 +1,6 @@ # Template file for 'freeplane' pkgname=freeplane -version=1.6.8 +version=1.6.9 revision=1 noarch=yes hostmakedepends="apache-ant openjdk unzip gradle" @@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni " license="GPL-2" homepage="http://freeplane.sourceforge.net/" distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz" -checksum=c618df41fddce6388dfefd458bed092dbc498b02d40b4521532e61dfcb0e427e +checksum=bb88d0336dd3d098f39d17adee3195dbc1214149dfbf2e604cb31a7555206e95 make_dirs=" /usr/share/freeplane/fwdir/condperm/ 755 root root diff --git a/srcpkgs/freetds/template b/srcpkgs/freetds/template index 2de68e07be4..d1c1b5241e6 100644 --- a/srcpkgs/freetds/template +++ b/srcpkgs/freetds/template @@ -1,6 +1,6 @@ # Template file for 'freetds' pkgname=freetds -version=1.00.64 +version=1.00.67 revision=1 build_style=gnu-configure configure_args="--sysconfdir=/etc/$pkgname" @@ -12,7 +12,7 @@ maintainer="Diogo Leal " license="LGPL-3" homepage="http://www.freetds.org/" distfiles="ftp://ftp.freetds.org/pub/freetds/stable/${pkgname}-${version}.tar.gz" -checksum=047e77eee7da98fb8811db7962d5e5041695d50471cd5dbdcb7daa3e7b649614 +checksum=bed3831b2d4bf0d0be571bac0f7eb327d964eb5a7b7e59ca54a3ae9fc8c91130 freetds-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/fs-repo-migrations/template b/srcpkgs/fs-repo-migrations/template index 5f698d32f04..3e07023d892 100644 --- a/srcpkgs/fs-repo-migrations/template +++ b/srcpkgs/fs-repo-migrations/template @@ -1,7 +1,7 @@ # Template file for 'fs-repo-migrations' pkgname=fs-repo-migrations -version=1.2.2 -revision=4 +version=1.3.0 +revision=1 build_style=go go_import_path="github.com/ipfs/fs-repo-migrations" short_desc="Tool to upgrade the IPFS filesystem repository" @@ -9,7 +9,7 @@ maintainer="Christopher Brannon " license="MIT" homepage="https://github.com/ipfs/fs-repo-migrations" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=119d663d71a6820174dcc75bf52c1ca5cacf065e41e0f367bfbfc264dcffa9cf +checksum=103c2067073946090c8e82817ad566cc18e8000401d3de1582b303296eacb39c post_install() { vlicense LICENSE diff --git a/srcpkgs/fsbext/template b/srcpkgs/fsbext/template new file mode 100644 index 00000000000..5459bbd54cb --- /dev/null +++ b/srcpkgs/fsbext/template @@ -0,0 +1,18 @@ +# Template file for 'fsbext' +pkgname=fsbext +version=0.3.8 +revision=1 +hostmakedepends="unzip" +build_style=gnu-makefile +make_build_target=fsbext +create_wrksrc=obviously +short_desc="Files extractor for the FSB archives used by the FMOD library" +maintainer="John " +license="GPL-1" +homepage="http://aluigi.altervista.org/search.php?src=fsbext" +distfiles="http://aluigi.altervista.org/papers/fsbext.zip" +checksum=608a84fd425df1eb849ce9f6529895154cb05f31282ed3cb8c7dce19ef2539b8 + +do_install() { + vbin fsbext +} diff --git a/srcpkgs/fwup/template b/srcpkgs/fwup/template index 128f7126d2e..3883afeb390 100644 --- a/srcpkgs/fwup/template +++ b/srcpkgs/fwup/template @@ -1,17 +1,17 @@ # Template file for 'fwup' pkgname=fwup -version=0.16.1 +version=0.17.0 revision=1 build_style=gnu-configure -configure_args="ac_vc_func_open_memstream=yes" hostmakedepends="automake libtool pkg-config" makedepends="libarchive-devel libsodium-devel confuse-devel" short_desc="Configurable embedded Linux firmware update creator and runner" maintainer="Duncaen " license="Apache-2.0" +#changelog="https://raw.githubusercontent.com/fhunleth/fwup/master/CHANGELOG.md" homepage="https://github.com/fhunleth/fwup" distfiles="https://github.com/fhunleth/fwup/archive/v${version}.tar.gz" -checksum=4cfce180a494f6014a6dcd7c49b148bd0108740d9594e484d3bbdc6c8618bdf5 +checksum=c3fe73da33ed5a1527361aa61f97a6cad4a937a884dd933b04407b4198fefa33 if [ -z "$CROSS_BUILD" ]; then hostmakedepends+=" help2man" diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template index b6c8b176cd6..22e020e9591 100644 --- a/srcpkgs/fzf/template +++ b/srcpkgs/fzf/template @@ -1,6 +1,6 @@ # Template file for 'fzf' pkgname=fzf -version=0.17.0 +version=0.17.1 revision=1 build_style=go go_import_path="github.com/junegunn/fzf" @@ -11,7 +11,7 @@ license="MIT" homepage="https://github.com/junegunn/fzf" short_desc="Command-line fuzzy finder" distfiles="https://github.com/junegunn/fzf/archive/${version}.tar.gz" -checksum=23569faf64cd6831c09aad7030c8b4bace0eb7a979c580b33cc4e4f9ff303e29 +checksum=9c881e55780c0f56b5a30b87df756634d853bfd3938e7e53cb2df6ed63aa84a7 post_install() { cd ${wrksrc} diff --git a/srcpkgs/gcc-multilib/patches/fix-glibc-2.26.patch b/srcpkgs/gcc-multilib/patches/fix-glibc-2.26.patch new file mode 120000 index 00000000000..3f1aa57333c --- /dev/null +++ b/srcpkgs/gcc-multilib/patches/fix-glibc-2.26.patch @@ -0,0 +1 @@ +../../gcc/patches/fix-glibc-2.26.patch \ No newline at end of file diff --git a/srcpkgs/gcc-multilib/template b/srcpkgs/gcc-multilib/template index b15e2984faf..3c4d8cb1110 100644 --- a/srcpkgs/gcc-multilib/template +++ b/srcpkgs/gcc-multilib/template @@ -5,7 +5,7 @@ _majorver=6.3 pkgname=gcc-multilib version=${_majorver}.0 -revision=3 +revision=4 wrksrc="gcc-${version}" short_desc="The GNU C Compiler (multilib files)" maintainer="Juan RP " diff --git a/srcpkgs/gcompat/patches/aarch64.patch b/srcpkgs/gcompat/patches/aarch64.patch new file mode 100644 index 00000000000..386d6bd3569 --- /dev/null +++ b/srcpkgs/gcompat/patches/aarch64.patch @@ -0,0 +1,17 @@ +--- libgcompat/sysctl.c.orig 2017-10-19 10:51:44.000000000 +0000 ++++ libgcompat/sysctl.c 2017-10-19 10:51:55.988937813 +0000 +@@ -4,6 +4,8 @@ + #include + + ++#ifdef SYS__sysctl // deprecated sysctl not available on aarch64 ++ + struct __sysctl_args { + int *name; + int nlen; +@@ -26,3 +28,5 @@ + + return syscall(SYS__sysctl, &args); + } ++ ++#endif diff --git a/srcpkgs/gcompat/template b/srcpkgs/gcompat/template index 2046bd9124c..c6f515c040e 100644 --- a/srcpkgs/gcompat/template +++ b/srcpkgs/gcompat/template @@ -1,18 +1,14 @@ # Template file for 'gcompat' pkgname=gcompat -version=0.0.1 +version=0.1.0 revision=1 -wrksrc="${pkgname}-${pkgname}-${version}" build_style="gnu-makefile" short_desc="Compatibility layer to allow running glibc binaries on musl systems" maintainer="Daniel James " -homepage="https://github.com/AdelieLinux/gcompat" +homepage="https://code.foxkit.us/adelie/gcompat" license="ISC" -distfiles="https://github.com/AdelieLinux/${pkgname}/archive/${pkgname}-${version}.tar.gz - https://raw.githubusercontent.com/AdelieLinux/${pkgname}/master/LICENSE" -checksum="138f4094977268a762415da10c05bcf87fae948faa8ff13a9b8b4ff4d64c91e6 - 9edc99844a4c06b75f200fb96a72af4b8cc2da4c6662b8610157c24d428fa5c4" -skip_extraction="LICENSE" +distfiles="https://distfiles.AdelieLinux.org/source/${pkgname}-${version}.tar.xz" +checksum="3093397f69dfee45b60e3b7ea02b26b625bfb57f9c1dbb5d6ceadda6f823578b" # https://sourceware.org/glibc/wiki/ABIList # https://wiki.linaro.org/RikuVoipio/LdSoTable @@ -43,5 +39,5 @@ pre_build() { } post_install() { - vlicense ${XBPS_SRCDISTDIR}/${pkgname}-${version}/LICENSE + vlicense LICENSE } diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index c32dd607993..7c40adc02d6 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,6 +1,6 @@ # Template file for 'gdm' pkgname=gdm -version=3.26.0 +version=3.26.1 revision=1 build_style=gnu-configure configure_args="$(vopt_enable gir introspection) @@ -32,7 +32,7 @@ maintainer="Enno Boland " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=afb8cac6b027bed672e9d6af0c5e70033352455425d6fa254478652ee3dce8d9 +checksum=2bfaa3664281461261e1e38be5b961cfa15da7284edbe416440b9cfc8f9504d6 # Package build options build_options="gir" diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template index 3a8f1c9fd94..418d6b22921 100644 --- a/srcpkgs/geary/template +++ b/srcpkgs/geary/template @@ -1,18 +1,18 @@ # Template file for 'geary' pkgname=geary -version=0.11.2 -revision=2 +version=0.12.0 +revision=1 build_style=cmake configure_args="-DNO_FATAL_WARNINGS=ON" -hostmakedepends="pkg-config intltool desktop-file-utils gnome-doc-utils" +hostmakedepends="pkg-config intltool desktop-file-utils gnome-doc-utils iso-codes" makedepends=" - vala-devel webkitgtk-devel libgee08-devel libcanberra-devel libsecret-devel + vala-devel webkit2gtk-devel libgee08-devel libcanberra-devel libsecret-devel gmime-devel libunique-devel sqlite-devel libnotify-devel libgirepository-devel - gcr-devel glib-devel" + gcr-devel glib-devel enchant-devel" depends="gir-freedesktop hicolor-icon-theme desktop-file-utils gnome-keyring" short_desc="A lightweight email program for the GNOME desktop" maintainer="Juan RP " license="LGPL-2.1" homepage="https://wiki.gnome.org/Apps/Geary" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz" -checksum=5c9e20ecd53672a42e22a436b9d3b6b9e9bf81ddf77163414a1c55986f9b4631 +checksum=cef1093033ddfb52942b45c901562539cee7a192e981c7f19e2075ecb0c22446 diff --git a/srcpkgs/ghostwriter/INSTALL.msg b/srcpkgs/ghostwriter/INSTALL.msg new file mode 100644 index 00000000000..38f97374fc4 --- /dev/null +++ b/srcpkgs/ghostwriter/INSTALL.msg @@ -0,0 +1 @@ +A hunspell dictionary must be installed for live spell-checking to work. diff --git a/srcpkgs/ghostwriter/template b/srcpkgs/ghostwriter/template index 292a8bb9115..c0e268e4bd0 100644 --- a/srcpkgs/ghostwriter/template +++ b/srcpkgs/ghostwriter/template @@ -1,7 +1,7 @@ # Template file for 'ghostwriter' pkgname=ghostwriter version=1.5.0 -revision=1 +revision=2 build_style=qmake hostmakedepends="qt5-qmake pkg-config" makedepends="qt5-devel qt5-tools-devel qt5-multimedia-devel qt5-svg-devel qt5-webkit-devel hunspell-devel" diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template index 0b1b4199817..125891bfe29 100644 --- a/srcpkgs/gjs/template +++ b/srcpkgs/gjs/template @@ -1,6 +1,6 @@ # Template file for 'gjs' pkgname=gjs -version=1.50.0 +version=1.50.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool glib-devel gobject-introspection" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="MPL-1.1, LGPL-2.1, GPL-2" homepage="https://wiki.gnome.org/action/show/Projects/Gjs" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=2d529d315fc926995c5174d0ac45dacd604e52b9213ba3c4cd77f30bc4aec945 +checksum=41519fd63978745d17dbccb688a55f1850a7ba72f3c86274ca985d88dbff9fdf gjs-devel_package() { depends="libgirepository-devel mozjs52-devel ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template index f52044717e4..ec4a88ab3e3 100644 --- a/srcpkgs/glade3/template +++ b/srcpkgs/glade3/template @@ -1,6 +1,6 @@ # Template file for 'glade3' pkgname=glade3 -version=3.20.0 +version=3.20.1 revision=1 wrksrc="glade-${version}" build_style=gnu-configure @@ -13,7 +13,7 @@ homepage="http://glade.gnome.org/" license="GPL-2" maintainer="Juan RP " distfiles="${GNOME_SITE}/glade/${version%.*}/glade-${version}.tar.xz" -checksum=82d96dca5dec40ee34e2f41d49c13b4ea50da8f32a3a49ca2da802ff14dc18fe +checksum=8064676dd46baa7e00c38ec1cc3ddc75c4ef5e714cd9d1491309b4df3e9cb1df lib32disabled=yes diff --git a/srcpkgs/glm/template b/srcpkgs/glm/template index 4892b22c244..e64ce0ac94e 100644 --- a/srcpkgs/glm/template +++ b/srcpkgs/glm/template @@ -1,6 +1,6 @@ # Template file for 'glm' pkgname=glm -version=0.9.8.4 +version=0.9.8.5 revision=1 noarch=yes build_style=cmake @@ -10,7 +10,7 @@ license="MIT" short_desc="A C++ mathematics library for graphics programming" homepage="http://glm.g-truc.net" distfiles="https://github.com/g-truc/glm/releases/download/${version}/glm-${version}.zip" -checksum=a9b7f544b6d03739f22261da9f294638dd4671d466fe3860c7262cd037752cb1 +checksum=9f9f520ec7fb8c20c69d6b398ed928a2448c6a3245cbedb8631a56a987c38660 wrksrc=${pkgname} post_install() { diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template index 20192d38531..f598a7c2573 100644 --- a/srcpkgs/gnome-boxes/template +++ b/srcpkgs/gnome-boxes/template @@ -1,10 +1,9 @@ # Template file for 'gnome-boxes' pkgname=gnome-boxes -version=3.26.0 +version=3.26.1 revision=1 # XXX ovirt support. build_style=gnu-configure -configure_args="--enable-smartcard" hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection)" makedepends="clutter-gtk-devel gtk+3-devel gtk-vnc-devel libuuid-devel libvirt-glib-devel libxml2-devel libgudev-devel libosinfo-devel @@ -17,7 +16,8 @@ maintainer="Juan RP " homepage="https://live.gnome.org/Boxes" license="LGPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=7a525ad23a950f7036ef989686ee4cc781091e9fc2df153953a818bac758c09b +checksum=fc0d4479b076393caeeab22d9ae3247503b9eb15b6bfe8fdfab2f2435051fa58 +nocross="won't cross-compile without gobject-introspection, gobject-intropection can't be cross compiled" build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index d599117197d..32e3ee8af2d 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -1,8 +1,9 @@ # Template file for 'gnome-builder' pkgname=gnome-builder -version=3.26.0 +version=3.26.1 revision=1 build_style=meson +# XXX: missing unpackaged flatpak-builder package for building flatpaks hostmakedepends="pkg-config intltool itstool gnome-doc-utils appdata-tools glib-devel desktop-file-utils mm-common vala llvm gobject-introspection gspell-devel flex" @@ -15,4 +16,4 @@ maintainer="Enno Boland " homepage="https://wiki.gnome.org/Apps/Builder" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=56be186858fe0d83716df41d7729c21d2fc0ce3020bacea6f319ac8ccf2fd949 +checksum=f9cbd537c9aac84019372a389caf868b6688f47279058d186a1a28b0d8245e29 diff --git a/srcpkgs/gnome-builder/template.orig b/srcpkgs/gnome-builder/template.orig deleted file mode 100644 index bed22d81508..00000000000 --- a/srcpkgs/gnome-builder/template.orig +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'gnome-builder' -pkgname=gnome-builder -version=3.26.0 -revision=1 -build_style=meson -hostmakedepends="pkg-config intltool itstool gnome-doc-utils appdata-tools - glib-devel desktop-file-utils mm-common vala llvm gobject-introspection - gspell-devel flex" -makedepends="gtk+3-devel gtksourceview-devel json-glib-devel libpeas-devel - libsoup-devel libgit2-glib-devel clang" -depends="desktop-file-utils" -short_desc="IDE for GNOME" -maintainer="Enno Boland " -homepage="https://wiki.gnome.org/Apps/Builder" -license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=56be186858fe0d83716df41d7729c21d2fc0ce3020bacea6f319ac8ccf2fd949 diff --git a/srcpkgs/gnome-builder/template.rej b/srcpkgs/gnome-builder/template.rej deleted file mode 100644 index bae2f78b6d6..00000000000 --- a/srcpkgs/gnome-builder/template.rej +++ /dev/null @@ -1,25 +0,0 @@ ---- template -+++ template -@@ -2,13 +2,13 @@ - pkgname=gnome-builder - version=3.26.0 - revision=1 --build_style=gnu-configure --configure_args="--disable-schemas-compile" -+build_style=meson - hostmakedepends="pkg-config intltool itstool gnome-doc-utils appdata-tools - glib-devel desktop-file-utils mm-common vala llvm gobject-introspection -- gspell-devel" -+ gspell-devel flex" - makedepends="gtk+3-devel gtksourceview-devel json-glib-devel libpeas-devel -- libsoup-devel libgit2-glib-devel clang" -+ libsoup-devel libgit2-glib-devel clang webkit2gtk-devel devhelp-devel -+ flatpak-devel vte3-devel sysprof-devel" - depends="desktop-file-utils" - short_desc="IDE for GNOME" - maintainer="Enno Boland " -@@ -16,4 +16,3 @@ homepage="https://wiki.gnome.org/Apps/Builder" - license="GPL-2" - distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" - checksum=56be186858fe0d83716df41d7729c21d2fc0ce3020bacea6f319ac8ccf2fd949 --broken=https://build.voidlinux.eu/builders/x86_64_builder/builds/4733/steps/shell_3/logs/stdio diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template index 5f3d8f311d0..8caf29ef2f8 100644 --- a/srcpkgs/gnome-calculator/template +++ b/srcpkgs/gnome-calculator/template @@ -1,6 +1,6 @@ # Template file for 'gnome-calculator' pkgname=gnome-calculator -version=3.24.0 +version=3.25.92 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool itstool glib-devel gnome-doc-utils" @@ -13,4 +13,4 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=44758ac719edd20067381073de3c643f842308f26da039412b1978a415202d10 +checksum=e722f648e6847de4b6e34c300eedf277e0dfecf0f40f93ac6cc0968dc92d8510 diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template index 247c358cf37..0f0f799cb78 100644 --- a/srcpkgs/gnome-calendar/template +++ b/srcpkgs/gnome-calendar/template @@ -1,9 +1,8 @@ # Template file for 'gnome-calendar' pkgname=gnome-calendar -version=3.24.3 +version=3.26.2 revision=1 -build_style=gnu-configure -configure_args="--disable-schemas-compile" +build_style=meson hostmakedepends="pkg-config intltool itstool glib-devel $(vopt_if gir gobject-introspection)" makedepends="gtk+3-devel gnome-online-accounts-devel evolution-data-server-devel libical-devel libpeas-devel gsettings-desktop-schemas-devel" @@ -12,7 +11,7 @@ maintainer="Enno Boland " license="GPL-2" homepage="https://wiki.gnome.org/Apps/Calendar" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3ecb4074f44cb6c883f81f93ebde2fa3890107f8e06740495be9f942190ff3ec +checksum=19a2c737b9662be926fb68e7dc731d94c523d23fa7a49e435e6a0346770dc50e build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnome-characters/template b/srcpkgs/gnome-characters/template index 585242fd883..c20a99caf90 100644 --- a/srcpkgs/gnome-characters/template +++ b/srcpkgs/gnome-characters/template @@ -1,17 +1,17 @@ # Template file for 'gnome-characters' pkgname=gnome-characters -version=3.24.0 +version=3.26.1 revision=1 lib32disabled=yes build_style=gnu-configure hostmakedepends="pkg-config intltool itstool glib-devel $(vopt_if gir gobject-introspection)" makedepends="gjs-devel gtk+3-devel libunistring-devel glib-devel" -short_desc="utility to find and insert unusual characters for GNOME." +short_desc="Utility to find and insert unusual characters for GNOME" maintainer="Enno Boland " homepage="https://wiki.gnome.org/Apps/Characters" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=9ef4ff28437a63a221c47189231909fb9e4cac838c5f3cf402906fb128b52596 +checksum=aed827414406261a6ff84f1aca9baf851996dfc6fde5880d7b3d6474651c3e46 build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template index 9798b7bf886..e67fe4a82fa 100644 --- a/srcpkgs/gnome-clocks/template +++ b/srcpkgs/gnome-clocks/template @@ -1,9 +1,9 @@ # Template file for 'gnome-clocks' pkgname=gnome-clocks -version=3.26.0 +version=3.26.1 revision=1 build_style=meson -hostmakedepends="pkg-config intltool itstool glib $(vopt_if gir gobject-introspection)" +hostmakedepends="pkg-config intltool itstool glib $(vopt_if gir gobject-introspection) vala" makedepends="glib-devel vala-devel gnome-desktop-devel libgweather-devel libcanberra-devel libnotify-devel gsound-devel geocode-glib-devel desktop-file-utils hicolor-icon-theme @@ -14,11 +14,11 @@ maintainer="Enno Boland " homepage="https://live.gnome.org/GnomeClocks" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0f30a0260e73c8c2925fb24b6abca0ad65f3021d695c42d74ccb2f18225e4501 - -broken="https://build.voidlinux.eu/builders/armv6l-musl_builder/builds/5015/steps/shell_3/logs/stdio" +checksum=2bd8d8df1d6aa0feddd4afc15d84b1308202fda59a3c3be42e3bce7e9ccd11f7 build_options="gir" if [ -z "$CROSS_BUILD" ]; then build_options_default+=" gir" +else + hostmakedepends+=" gsound-devel libgweather-devel glib-devel" fi diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index a228017b6f8..7d8a84646e4 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,7 +1,7 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center -version=3.26.0 -revision=2 +version=3.26.1 +revision=1 build_style=gnu-configure configure_args="--disable-static --with-cheese" short_desc="The GNOME control center" @@ -9,7 +9,7 @@ maintainer="Enno Boland " license="GPL-2" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=f519ce9bf268fd20cc81d46d23ad492cbc6975480c318d1ae4304c10d244c46f +checksum=5e5dbb0cd6b882d02662a94c15613f29be3b9152aa38847b17f8d5bea2cfc290 hostmakedepends="pkg-config intltool glib-devel gnome-doc-utils gobject-introspection" makedepends=" diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template index 8011b094e89..52f7acf91ca 100644 --- a/srcpkgs/gnome-desktop/template +++ b/srcpkgs/gnome-desktop/template @@ -1,6 +1,6 @@ # Template file for 'gnome-desktop' pkgname=gnome-desktop -version=3.26.0 +version=3.26.1 revision=1 build_style=gnu-configure configure_args="--with-gnome-distributor=VoidLinux" @@ -13,7 +13,7 @@ maintainer="Enno Boland " license="GPL-2, LGPL-2.1" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=8a99a084ea06fba20f5c547822dd8e36758676714729c7ae7b44ae3deca57be2 +checksum=92fa697af986fb2c6bc6595f0155c968c17e5d1981a50584ff4fb6fd60124e2f build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnome-dictionary/template b/srcpkgs/gnome-dictionary/template index b8721c77cb4..fa9eb1afa20 100644 --- a/srcpkgs/gnome-dictionary/template +++ b/srcpkgs/gnome-dictionary/template @@ -1,6 +1,6 @@ # Template file for 'gnome-dictionary' pkgname=gnome-dictionary -version=3.26.0 +version=3.26.1 revision=1 build_style=meson hostmakedepends="which pkg-config intltool itstool gnome-doc-utils glib-devel" @@ -12,7 +12,7 @@ maintainer="Enno Boland " homepage="https://wiki.gnome.org/Apps/Dictionary" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=387ff8fbb8091448453fd26dcf0b10053601c662e59581097bc0b54ced52e9ef +checksum=16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300 post_install() { # Remove -devel stuff. diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template index 86140cf6093..f25b5c7b2af 100644 --- a/srcpkgs/gnome-disk-utility/template +++ b/srcpkgs/gnome-disk-utility/template @@ -1,6 +1,6 @@ # Template file for 'gnome-disk-utility' pkgname=gnome-disk-utility -version=3.26.0 +version=3.26.1 revision=1 lib32disabled=yes build_style=meson @@ -16,7 +16,7 @@ maintainer="Enno Boland " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=efcd6da256fcf1a65fb39dc96b3665a62fa24ef226ba1686f0f26b663465fc93 +checksum=232ec4c2238902293e9ac8c0e05155a963b2d1941fda36660f070bcc36a55783 nocross=https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/5518/steps/shell_3/logs/stdio # Package build options diff --git a/srcpkgs/gnome-documents/template b/srcpkgs/gnome-documents/template index 8ce9f530c89..29cef942afb 100644 --- a/srcpkgs/gnome-documents/template +++ b/srcpkgs/gnome-documents/template @@ -1,6 +1,6 @@ # Template file for 'gnome-documents' pkgname=gnome-documents -version=3.26.0 +version=3.26.1 revision=1 lib32disabled=yes build_style=gnu-configure @@ -10,13 +10,14 @@ makedepends=" gnome-online-accounts-devel libgdata-devel tracker-devel evince-devel gjs-devel libsoup-gnome-devel vala-devel webkit2gtk-devel librsvg-devel libgepub-devel" -depends="desktop-file-utils hicolor-icon-theme libgepub" +depends="desktop-file-utils hicolor-icon-theme libgepub + tracker tracker-miners" short_desc="Documents Manager for GNOME" maintainer="Enno Boland " homepage="https://wiki.gnome.org/Apps/Documents" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=abfeb2835525d57eaf14ad874fd93f0b8385b1796ee79508bb3024118b261593 +checksum=ba0d3084359d666b90733bb43206d24190fa85304bfe45f674ab6e6a27cb7fc9 build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnome-getting-started-docs/template b/srcpkgs/gnome-getting-started-docs/template index 4edeeb809b6..23bbf22580b 100644 --- a/srcpkgs/gnome-getting-started-docs/template +++ b/srcpkgs/gnome-getting-started-docs/template @@ -1,6 +1,6 @@ # Template file for 'gnome-gettings-stated-docs' pkgname=gnome-getting-started-docs -version=3.26.0 +version=3.26.1 revision=1 noarch="yes" build_style=gnu-configure @@ -10,4 +10,4 @@ short_desc="Getting Started documentation for GNOME" maintainer="Enno Boland " license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=27cb456d3dbf033253127bc0b817f56cd942caa0a9508bdbf25cae08a7bc961d +checksum=effc11424f2e7320aa893a6b82c97602817fd7c862dbb8852f61e10c9d5c92a2 diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template index f358f9458f5..3c27497e8dd 100644 --- a/srcpkgs/gnome-maps/template +++ b/srcpkgs/gnome-maps/template @@ -1,6 +1,6 @@ # Template file for 'gnome-maps' pkgname=gnome-maps -version=3.26.0 +version=3.26.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool glib-devel $(vopt_if gir gobject-introspection)" @@ -13,7 +13,7 @@ maintainer="Enno Boland " homepage="http://live.gnome.org/Design/Apps/Maps" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=f412919e2549c59929898d8303b5bfa92a8333f8eb1dd07d8fdf64be17300514 +checksum=b92cd80ef37952ad8ce9c1526d1c632d7e7566539b1cb732bd6d304ba243815a build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnome-multi-writer/template b/srcpkgs/gnome-multi-writer/template new file mode 100644 index 00000000000..e41ed24f845 --- /dev/null +++ b/srcpkgs/gnome-multi-writer/template @@ -0,0 +1,19 @@ +# Template file for 'gnome-multi-writer' +pkgname=gnome-multi-writer +version=3.26.0 +revision=1 +build_style=meson +hostmakedepends="docbook2mdoc $(vopt_if gir gobject-introspection) pkg-config" +makedepends="gtk+3-devel libgusb-devel udisks2-devel polkit-devel" +short_desc="Writes ISO files to multiple USB devices at once" +maintainer="Enno Boland " +homepage="https://live.gnome.org/GnomeClocks" +license="GPL-2" +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=aae3f4ffd8fd907cf75ea09c6a8167400388a8584d21ddaec0c252d8196e2bcf +broken=yes + +build_options="gir" +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gir" +fi diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template index c1e5e426be0..8d927c09faf 100644 --- a/srcpkgs/gnome-music/template +++ b/srcpkgs/gnome-music/template @@ -1,6 +1,6 @@ # Template file for 'gnome-music' pkgname=gnome-music -version=3.26.0 +version=3.26.1 revision=1 lib32disabled=yes build_style=gnu-configure @@ -8,13 +8,14 @@ pycompile_module="gnomemusic" hostmakedepends="pkg-config intltool itstool glib-devel $(vopt_if gir gobject-introspection)" makedepends="python3-devel python-gobject-devel python3-dbus grilo-devel gnome-desktop-devel libmediaart-devel tracker-devel" -depends="python3-gobject python3-dbus desktop-file-utils python3-requests" +depends="python3-gobject python3-dbus desktop-file-utils python3-requests + tracker tracker-miners" short_desc="GNOME music playing application" maintainer="Enno Boland " homepage="https://wiki.gnome.org/Apps/Music" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=3c52144e1c8b97844de97d92ab711f00b2c9591687a42d773e872b90373ff752 +checksum=7197dff12f441a52b4011512bfe8ec926f2ce4ca511f79b078e0e612d612f8c3 build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template index 274fdef52b1..79ca8781a2b 100644 --- a/srcpkgs/gnome-online-accounts/template +++ b/srcpkgs/gnome-online-accounts/template @@ -1,6 +1,6 @@ # Template file for 'gnome-online-accounts' pkgname=gnome-online-accounts -version=3.26.0 +version=3.26.1 revision=1 build_style=gnu-configure configure_args="$(vopt_enable gir introspection) @@ -17,7 +17,7 @@ maintainer="Enno Boland " homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts" license="LGPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=5cab736751c19efca762c0459e3358255d6662a6f4f27728cd02ea7b024e52ac +checksum=603c110405cb89a01497a69967f10e3f3f36add3dc175b062ec4c5ed4485621b build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template index 4a2025eb63c..742a97dc5e2 100644 --- a/srcpkgs/gnome-photos/template +++ b/srcpkgs/gnome-photos/template @@ -1,6 +1,6 @@ # Template file for 'gnome-photos' pkgname=gnome-photos -version=3.26.0 +version=3.26.1 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile" @@ -9,13 +9,13 @@ makedepends="gtk+3-devel babl-devel gegl3-devel exempi-devel lcms2-devel gfbgrap tracker-devel libexif-devel librsvg-devel grilo-devel libgexiv2-devel gnome-online-accounts-devel gnome-desktop-devel libgdata-devel geocode-glib-devel tracker-devel" -depends="desktop-file-utils" +depends="desktop-file-utils tracker tracker-miners" short_desc="Access, organize, and share your photos on GNOME" -maintainer="Juan RP " +maintainer="Enno Boland " homepage="https://wiki.gnome.org/Apps/Photos" license="GPL-2" distfiles="${GNOME_SITE}/gnome-photos/${version%.*}/gnome-photos-$version.tar.xz" -checksum=d664f1cca5aca7b2288ebba83d341c70170ca37165981142e8ca7ceb5c348055 +checksum=caee34e75a6a88f54f4f827e7bd5a819f64d18bd0ee1e3f4eb17f86df9c56acf nocross="https://s3.amazonaws.com/archive.travis-ci.org/jobs/219873990/log.txt" build_options="gir" diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template index aa392c2315a..44636d3a876 100644 --- a/srcpkgs/gnome-session/template +++ b/srcpkgs/gnome-session/template @@ -1,6 +1,6 @@ # Template file for 'gnome-session' pkgname=gnome-session -version=3.26.0 +version=3.26.1 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile" @@ -15,7 +15,7 @@ maintainer="Enno Boland " homepage="http://www.gnome.org" license="GPL-2, LGPL-2.1" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=6f8254b4891f76852b65a7c164dc504dfeff1aa32092e1b262bb670efedac489 +checksum=d9414b368db982d3837ca106e64019f18e6cdd5b13965bea6c7d02ddf5103708 pre_configure() { sed -i "s/^#ifdef HAVE_SYSTEMD/#if 0/" \ diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index b4475f7f66e..35673260c9b 100644 --- a/srcpkgs/gnome-settings-daemon/template +++ b/srcpkgs/gnome-settings-daemon/template @@ -1,6 +1,6 @@ # Template file for 'gnome-settings-daemon' pkgname=gnome-settings-daemon -version=3.26.0 +version=3.26.1 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --enable-cups" @@ -18,7 +18,7 @@ maintainer="Enno Boland " homepage="http://www.gnome.org" license="GPL-3" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=0e4c0ce3ac14262be022c3c33ebab794d7bd6a36b0246084be452b1ec540dc05 +checksum=711ac9bad06f6a4225f5eb2f4796474662f81f7077e16a4b7ee7ab974b65d893 pre_configure() { # XXX workaround wrong paths for build diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template index 9a09e398afe..09ddc5d774d 100644 --- a/srcpkgs/gnome-shell-extensions/template +++ b/srcpkgs/gnome-shell-extensions/template @@ -1,6 +1,6 @@ # Template file for 'gnome-shell-extensions' pkgname=gnome-shell-extensions -version=3.26.0 +version=3.26.1 revision=1 noarch="yes" build_style=gnu-configure @@ -13,4 +13,4 @@ maintainer="Enno Boland " homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=f51b59b4ae192d7480229657cab2354bee24d40857384a0fde72d0af2635f704 +checksum=2437c6abce399a97ff95c2de9784580a5db82c59b67e09eaf2c8d972cca1d6d0 diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index b4d966d14ab..9b0eafa7a54 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,9 +1,9 @@ # Template file for 'gnome-shell' pkgname=gnome-shell -version=3.26.0 +version=3.26.1 revision=1 -build_style=gnu-configure -configure_args="--disable-schemas-compile --disable-systemd" +build_style=meson +configure_args="-Denable-systemd=no" hostmakedepends=" pkg-config intltool gnome-doc-utils $(vopt_if gir gobject-introspection) python3 meson" @@ -22,7 +22,7 @@ maintainer="Enno Boland " homepage="https://wiki.gnome.org/Projects/GnomeShell" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=9bc35c206435d6e0ee9e8880578716a7d5bd0ebe7d475fa4f0b3010b44eebaed +checksum=38d98da06eb0118a0226623494b11765b3981414e804e270dc0cf03e37c708b9 build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnome-ssh-askpass/template b/srcpkgs/gnome-ssh-askpass/template index 9ecb44e9f80..3191e040398 100644 --- a/srcpkgs/gnome-ssh-askpass/template +++ b/srcpkgs/gnome-ssh-askpass/template @@ -1,6 +1,6 @@ # Template file for 'gnome-ssh-askpass' pkgname=gnome-ssh-askpass -version=7.2p2 +version=7.5p1 revision=1 wrksrc="openssh-${version}" hostmakedepends="pkg-config" @@ -9,14 +9,19 @@ short_desc="GTK SSH passphrase grabber (from OpenSSH)" maintainer="Christian Neukirchen " license="BSD" homepage="http://www.openssh.org" -distfiles="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$version.tar.gz" -checksum=a72781d1a043876a224ff1b0032daa4094d87565a68528759c1c2cab5482548c +distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$version.tar.gz" +checksum=9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f0 + +alternatives=" + ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass +" do_build() { cd contrib - ${CC} ${CFLAGS} $(pkg-config --cflags gtk+-2.0) gnome-ssh-askpass2.c -o gnome-ssh-askpass $(pkg-config --libs gtk+-2.0) ${LDFLAGS} -lX11 + ${CC} ${CFLAGS} $(pkg-config --cflags gtk+-2.0) ${pkgname}2.c -o ${pkgname} $(pkg-config --libs gtk+-2.0) ${LDFLAGS} -lX11 } do_install() { - vbin contrib/gnome-ssh-askpass + vbin contrib/${pkgname} + vlicense LICENCE } diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template index c2e8c6b2fb2..1cccad3bc58 100644 --- a/srcpkgs/gnome-terminal/template +++ b/srcpkgs/gnome-terminal/template @@ -1,6 +1,6 @@ # Template file for 'gnome-terminal' pkgname=gnome-terminal -version=3.26.0 +version=3.26.1 revision=1 lib32disabled=yes build_style=gnu-configure @@ -16,4 +16,4 @@ maintainer="Enno Boland " homepage="https://wiki.gnome.org/Apps/Terminal" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=94c8d9e85b042160a0487af10f2002e1068f49805356b714a410766d74bc4e77 +checksum=b9ac564ef77fea0b10502c06bdfca15c4fbdc32fdadaa88d69d7bf0fa1de073a diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template index db4a2111cce..ec8a06346b4 100644 --- a/srcpkgs/gnome-todo/template +++ b/srcpkgs/gnome-todo/template @@ -1,19 +1,18 @@ # Template file for 'gnome-todo' pkgname=gnome-todo -version=3.24.2 +version=3.26.1 revision=1 -build_style=gnu-configure -configure_args="--disable-schemas-compile" +build_style=meson +configure_args="-Denable-introspection=$(vopt_if gir true false)" hostmakedepends="pkg-config intltool itstool glib-devel $(vopt_if gir gobject-introspection)" makedepends="gtk+3-devel gnome-online-accounts-devel evolution-data-server-devel - libical-devel libpeas-devel" + libical-devel libpeas-devel rest-devel" short_desc="Task manager designed to perfectly fit the GNOME desktop" maintainer="Enno Boland " license="GPL-2" homepage="https://wiki.gnome.org/Apps/Todo" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6985c75b9dd5883ed03af2b9ab9aa004152401ce455feb916248337e8077f8d4 -LDFLAGS="-ledataserver-1.2 -lgoa-1.0 -ledataserverui-1.2" +checksum=e4d390bd73ed2808e3de7f215a9584317d1cc9c6a7f802cf1fbb984c1e152e8e build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gnome-tweak-tool/template b/srcpkgs/gnome-tweak-tool/template index ac43195ab8d..572556ec58f 100644 --- a/srcpkgs/gnome-tweak-tool/template +++ b/srcpkgs/gnome-tweak-tool/template @@ -1,17 +1,17 @@ # Template file for 'gnome-tweak-tool' pkgname=gnome-tweak-tool -version=3.26.0 +version=3.26.2.1 revision=1 noarch=yes nocross=yes build_style=meson hostmakedepends="pkg-config intltool" makedepends="gtk+3-devel python-gobject-devel gsettings-desktop-schemas-devel" -depends="python python-gobject>=3.14 gsettings-desktop-schemas>=3.14 dconf hicolor-icon-theme desktop-file-utils" +depends="python python3-gobject>=3.14 gsettings-desktop-schemas>=3.14 dconf hicolor-icon-theme desktop-file-utils" pycompile_module="gtweak" short_desc="GNOME3 tool to customize advanced options" maintainer="Enno Boland " license="GPL-2" homepage="http://live.gnome.org/GnomeTweakTool" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=afb181d1d621e469a132af51a8112191787f31cb8350a675b349db493743a122 +distfiles="${GNOME_SITE}/${pkgname}/3.26/${pkgname}-${version}.tar.xz" +checksum=21bc055fbae554b2a79591d5a901a31f7515cae49fb6b99cddc041eb83a38a26 diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template index 300f775f3f2..9b0947fad1c 100644 --- a/srcpkgs/gnome-user-docs/template +++ b/srcpkgs/gnome-user-docs/template @@ -1,6 +1,6 @@ # Template file for 'gnome-user-docs' pkgname=gnome-user-docs -version=3.26.0 +version=3.26.1 revision=1 noarch="yes" build_style=gnu-configure @@ -12,4 +12,6 @@ short_desc="User documentation for GNOME" maintainer="Enno Boland " license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=ccb8043cd9cbe104a3f4ea72a2272fb764b5a6a0d2905ed2c1100d997b9130c5 +checksum=a64b1769d5f62726297df8b97576154db98b15ad0e7f759c39b3d6a85dbfa982 + +broken="https://build.voidlinux.eu/builders/x86_64_builder/builds/5404/steps/shell_3/logs/stdio" diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index 3b08dcebdd7..6f42bcb28c9 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -1,7 +1,7 @@ # Template file for 'gnome' pkgname=gnome version=3.26.0 -revision=1 +revision=2 build_style=meta short_desc="The GNOME meta-package for Void Linux" maintainer="Enno Boland " @@ -156,7 +156,6 @@ _apps_depends="aisleriot>=3.22.3 gnome-klotski>=3.22.2 gnome-mahjongg>=3.22.0 gnome-mines>=3.26.0 - gnome-multi-writer>=3.26.0 gnome-nettool>=3.8.1 gnome-nibbles>=3.24.0 gnome-recipes>=1.6.2 @@ -168,7 +167,7 @@ _apps_depends="aisleriot>=3.22.3 hitori>=3.22.3 iagno>=3.22.0 lightsoff>=3.26.0 - nautilus-sendto>=3.8.6 + nautilus-sendto>=3.8.0 nemiver>=0.9.6 polari>=3.26.0 quadrapassel>=3.22.0 diff --git a/srcpkgs/gnote/template b/srcpkgs/gnote/template index 40e632a96a6..9d321f1fae8 100644 --- a/srcpkgs/gnote/template +++ b/srcpkgs/gnote/template @@ -1,6 +1,6 @@ # Template file for 'gnote' pkgname=gnote -version=3.24.1 +version=3.26.0 revision=1 lib32disabled=yes build_style=gnu-configure @@ -13,4 +13,4 @@ maintainer="Juan RP " license="GPL-3" homepage="http://live.gnome.org/Gnote" distfiles="${GNOME_SITE}/gnote/${version%.*}/gnote-${version}.tar.xz" -checksum=1da5887c6d4221de292bd9fd310525bd05d60b9483bb1596e0cfb41f39995a7f +checksum=de205ace226a010aba576654db6a8e06eab064522549d3bdd6eb8a0bc9163be9 diff --git a/srcpkgs/gnustep-base-devel b/srcpkgs/gnustep-base-devel new file mode 120000 index 00000000000..b8cfd4a2f05 --- /dev/null +++ b/srcpkgs/gnustep-base-devel @@ -0,0 +1 @@ +gnustep-base \ No newline at end of file diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template new file mode 100644 index 00000000000..11e13c2863e --- /dev/null +++ b/srcpkgs/gnustep-base/template @@ -0,0 +1,30 @@ +# Template file for 'gnustep-base' +pkgname=gnustep-base +version=1.25.0 +revision=1 +build_style=gnu-configure +hostmakedepends="gnustep-make gcc-objc" +makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel + libxslt-devel icu-devel" +short_desc="Library of general-purpose Objective C objects for GNUstep" +maintainer="Andrew Benson " +license="GPL-3" +homepage="https://www.gnustep.org/" +distfiles="http://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz" +checksum=f5159a7d70e06b9dfb96c5f8ac572e3a5e6cf8de7bafb056bc9b2e0c4f93c347 + +nocross="objc doesn't get cross build at present within gcc" +case "$XBPS_TARGET_MACHINE" in + *-musl) configure_args="${configure_args} --disable-iconv"; + broken="musl patching for this is beyond the author at this time";; + *) ;; +esac + +gnustep-base-devel_package() { + short_desc+=" - development files" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/lib/*.so + vmove usr/include + } +} diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template index 8d7e4186ad7..0a970c895ea 100644 --- a/srcpkgs/go-ipfs/template +++ b/srcpkgs/go-ipfs/template @@ -1,22 +1,26 @@ # Template file for 'go-ipfs' pkgname=go-ipfs -version=0.4.10 -revision=3 +version=0.4.11 +revision=1 create_wrksrc=yes build_wrksrc=${pkgname}-${version} build_style=go hostmakedepends="gx-go" go_import_path="github.com/ipfs/${pkgname}" go_package="${go_import_path}/cmd/ipfs" -depends="fs-repo-migrations>=1.2.0" +depends="fs-repo-migrations>=1.3.0" short_desc="Global versioned P2P merkle DAG file system" maintainer="Christopher Brannon " license="MIT" homepage="https://ipfs.io" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum="d996f04b86c933626f71c00ba23f87e807d932899625703d7f0cf43133027e4d" +checksum=db763eedbb17162b2f1ec82307d85214da36c97a3fb9633f0b8126b26d9165b2 pre_build() { + # Disable the dynamic plugin loader for now; breaks cross. +if [ "$CROSS_BUILD" ]; then + rm plugin/loader/load_linux.go + fi gx install } diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template index d766dfcda53..5b7acd25e83 100644 --- a/srcpkgs/gobject-introspection/template +++ b/srcpkgs/gobject-introspection/template @@ -1,6 +1,6 @@ # Template file for 'gobject-introspection' pkgname=gobject-introspection -version=1.54.0 +version=1.54.1 revision=1 build_style=gnu-configure configure_args="--disable-tests --disable-static" @@ -13,7 +13,7 @@ maintainer="Enno Boland " homepage="http://live.gnome.org/GObjectInstrospection" license="GPL-2, LGPL-2.1" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=67e76742ce78821bce8a613183368222919b24e2dcf5fe26f17726c11c422ed7 +checksum=b88ded5e5f064ab58a93aadecd6d58db2ec9d970648534c63807d4f9a7bb877e nocross=yes gir-freedesktop_package() { diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template index e825011397c..ff0d598d781 100644 --- a/srcpkgs/google-chrome/template +++ b/srcpkgs/google-chrome/template @@ -1,11 +1,11 @@ # Template file for 'google-chrome' -_chromeVersion=61.0.3163.100 +_chromeVersion=62.0.3202.62 _chromeRevision=1 _channel=stable pkgname=google-chrome version=${_chromeVersion}.${_chromeRevision} -revision=1 +revision=2 maintainer="Michael Aldridge " homepage="http://www.google.com/chrome/" license="chrome" @@ -20,7 +20,7 @@ _filename="google-chrome-${_channel}_${_chromeVersion}-${_chromeRevision}_amd64. _chromeUrl="${_baseUrl}/${_filename}" distfiles="${_chromeUrl}" -checksum=5b8b9655db8dcce4b276db7860ae1c8ce1079a33f161a716c17fda24b8d5a9b2 +checksum=98a34a85ba0018d3897a8a11de9f29df08e77d64a9d991df66fcf5c5cdd957c6 do_extract() { mkdir -p ${DESTDIR} diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template index eaca886cc2f..eee394caa67 100644 --- a/srcpkgs/gopass/template +++ b/srcpkgs/gopass/template @@ -1,6 +1,6 @@ # Template file for 'gopass' pkgname=gopass -version=1.4.1 +version=1.5.0 revision=1 build_style=go go_import_path="github.com/justwatchcom/gopass" @@ -10,7 +10,7 @@ maintainer="Dominic Monroe " license="MIT" homepage="https://www.justwatch.com/gopass/" distfiles="https://github.com/justwatchcom/gopass/archive/v${version}.tar.gz" -checksum=59b91c11fdb4bbddee3b38f76a73557313a35660d0d56f4008662f3f12490098 +checksum=dd220671a8886725aa3c671073d44a0b6699e498d9cd254dea579b1ecce7f9f9 post_install() { vlicense LICENSE diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template index 905b852c55f..12c84487dde 100644 --- a/srcpkgs/gparted/template +++ b/srcpkgs/gparted/template @@ -1,18 +1,18 @@ # Template file for 'gparted' pkgname=gparted -version=0.29.0 +version=0.30.0 revision=1 build_style=gnu-configure configure_args="--enable-libparted-dmraid" hostmakedepends="pkg-config intltool gnome-doc-utils" -makedepends="libuuid-devel libparted-devel gtkmm2-devel gnome-doc-utils" +makedepends="libuuid-devel libparted-devel gtkmm2-devel gnome-doc-utils glib-devel" depends="hicolor-icon-theme desktop-file-utils" short_desc="Gnome Partition Editor" maintainer="Juan RP " homepage="http://gparted.sourceforge.net" license="GPL-2" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=2250bf6bb43687be149c2a95fbfe2f6f0215690e187179d5f733ae518fa7c3cd +checksum=d31193effe058bdaeb2a4cd4b514ec753191179a0bc3abefda68a2b7975ecf4a pre_configure() { sed -i "s:@gksuprog@ @installdir@/gparted %f:@installdir@/gparted-pkexec %f:g" gparted.desktop.in.in diff --git a/srcpkgs/gradio/template b/srcpkgs/gradio/template index 64deee45666..9802225f61a 100644 --- a/srcpkgs/gradio/template +++ b/srcpkgs/gradio/template @@ -1,9 +1,8 @@ # Template file for 'gradio' pkgname=gradio -version=5.0 +version=6.0.2 revision=1 -build_style=gnu-configure -configure_script="./autogen.sh" +build_style=meson hostmakedepends="automake intltool itstool yelp-tools glib-devel pkg-config gettext gettext-devel vala" makedepends="gtk+3-devel gettext-devel vala-devel @@ -16,4 +15,4 @@ maintainer="Logen Kain " license="GPL-3" homepage="https://github.com/haecker-felix/gradio" distfiles="https://github.com/haecker-felix/${pkgname}/archive/v${version}.tar.gz" -checksum=ed7edc9aed2019493237334ecbc23ab4e34ba9649f99a1e301f087ddcb40af69 +checksum=941b8abea901699f3110894ada34c74a51df518c6b83ea6cd237ffcac18e2092 diff --git a/srcpkgs/granite/template b/srcpkgs/granite/template index 38fe21feb52..1ba153a4031 100644 --- a/srcpkgs/granite/template +++ b/srcpkgs/granite/template @@ -1,6 +1,6 @@ # Template file for 'granite' pkgname=granite -version=0.3.1 +version=0.4.1 revision=1 build_style=cmake hostmakedepends="pkg-config gobject-introspection vala-devel" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="https://launchpad.net/granite" license="LGPL-3" distfiles="https://launchpad.net/granite/${version%.*}/${version}/+download/granite-${version}.tar.xz" -checksum=8ec1d61f9aba75f1b3a745e721288b0dfb34cb11d1307be80cef7b0571c2dec6 +checksum=8bb411523e6cd5685c928dbfe08893892189cedf9fad5f537aa76182032cf09c nocross="error: Package 'gee-0.8' not found in specified Vala API directories or GObject-Introspection GIR directories" diff --git a/srcpkgs/gscreenshot/template b/srcpkgs/gscreenshot/template index e0acf412dd5..bbc129b705b 100644 --- a/srcpkgs/gscreenshot/template +++ b/srcpkgs/gscreenshot/template @@ -1,6 +1,6 @@ # Template file for 'gscreenshot' pkgname=gscreenshot -version=2.8.0 +version=2.9.2 revision=1 noarch=yes build_style=python2-module @@ -12,4 +12,4 @@ maintainer="Rui Flora " license="GPL-2" homepage="https://github.com/thenaterhood/gscreenshot" distfiles="https://github.com/thenaterhood/gscreenshot/archive/v${version}.tar.gz" -checksum=46675c621f81056c1e087bd3316b4dcc10ca9170f31e8734637de43686d13d87 +checksum=bcc04efc88ee900f55941886b7e79546f74cd4e3169d4ded24005b54eb6e2488 diff --git a/srcpkgs/gsl-ucg/patches/detect_gcc_better.patch b/srcpkgs/gsl-ucg/patches/detect_gcc_better.patch deleted file mode 100644 index 460bd65929d..00000000000 --- a/srcpkgs/gsl-ucg/patches/detect_gcc_better.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/c -+++ src/c -@@ -154,8 +154,8 @@ fi - # - # Generic modern GCC system - # --case "$CCNAME" in --*gcc*) -+case "$($CCNAME --version)" in -+*gcc*|*GCC*) - [ -z "$BOOM_MODEL_NOOPT" ] && CCDEBUG="-O2" - [ -z "$BOOM_MODEL_NOOPT" ] && CCNODEBUG="$CCNODEBUG -O2" - CCOPTS="-D_REENTRANT -D_GNU_SOURCE -Wall -Wno-unused -fno-strict-aliasing" diff --git a/srcpkgs/gsl-ucg/patches/permit-cross.patch b/srcpkgs/gsl-ucg/patches/permit-cross.patch deleted file mode 100644 index 03e2dc6679e..00000000000 --- a/srcpkgs/gsl-ucg/patches/permit-cross.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/Makefile.bck 2017-09-06 02:54:04.375680332 -0400 -+++ src/Makefile 2017-09-06 02:54:16.048706017 -0400 -@@ -185,7 +185,6 @@ - smtxlog$(OBJ): smtxlog.c - - everything: libgsl$(LIB) gsl$(EXE) -- ./gsl$(EXE) -v - - code: - ./gsl$(EXE) -q ggconv.gxl ggdiag.gxl ggenvt.gxl ggfile.gxl gggsl.gxl ggmath.gxl ggpcre.gxl ggproc.gxl ggscrp.gxl ggsock.gxl ggstrn.gxl ggsymb.gxl ggthrd.gxl ggtime.gxl ggxml.gxl diff --git a/srcpkgs/gsl-ucg/template b/srcpkgs/gsl-ucg/template index ded438242f3..6ff68471209 100644 --- a/srcpkgs/gsl-ucg/template +++ b/srcpkgs/gsl-ucg/template @@ -1,17 +1,17 @@ # Template file for 'gsl-ucg' pkgname=gsl-ucg -version=4.1.4 +version=4.1.5 revision=1 wrksrc="gsl-${version}" build_wrksrc="src" build_style=gnu-makefile makedepends="pcre-devel" short_desc="Generator Scripting Language - Universal Code Generator" -maintainer="Toyam Cox " +maintainer="Toyam Cox " license="GPL-3" homepage="https://github.com/zeromq/gsl" distfiles="https://github.com/zeromq/gsl/archive/v${version}.tar.gz" -checksum=12c81cf0ede5cf7d16bb91ffb7ee5310ab4adfc438b495960cdf086974e9c8d2 +checksum=c1c3d61a1d89b65d0d1161c803bcdd6364045cc20d7e0c1f67f0955cd9b326b0 pre_build() { export CC="CCNAME='$CC' ./c -q" diff --git a/srcpkgs/gsmartcontrol/INSTALL.msg b/srcpkgs/gsmartcontrol/INSTALL.msg index 1476b81c0a2..7dec8d8fdbf 100644 --- a/srcpkgs/gsmartcontrol/INSTALL.msg +++ b/srcpkgs/gsmartcontrol/INSTALL.msg @@ -1,4 +1,7 @@ -To run gsmartcontrol through a desktop menu, a polkit authentication agent -must be running; for GNOME and KDE users it should be already installed, -otherwise you can install *lxpolkit* which is a lightweight polkit -authentication agent. +* gsmartcontrol must be run with high privileges. So its desktop menu + requires a running polkit authentication agent. GNOME or KDE DE + provide it. Otherwise, install lxpolkit that is a lightweight + polkit auth agent. + +* action "options > update Drive Database" does not work since + smartmontools package does not provide this feature. diff --git a/srcpkgs/gsmartcontrol/template b/srcpkgs/gsmartcontrol/template index 0cd038beaef..9b6c6b6dcba 100644 --- a/srcpkgs/gsmartcontrol/template +++ b/srcpkgs/gsmartcontrol/template @@ -1,6 +1,6 @@ # Template file for 'gsmartcontrol' pkgname=gsmartcontrol -version=1.1.0 +version=1.1.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ maintainer="yopito " license="GPL-3" homepage="http://gsmartcontrol.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=90c9ead852255f5e1a74a3ff6c265d1cbcba19ad2fc77059c60737c13a3cd2c8 +checksum=2e39ad330829ae93824732f1b663303ac9ea1223f703901fae28549a3b2d7518 post_install() { # license files uneeded diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template index 6fa9e798a84..63b18b53bf8 100644 --- a/srcpkgs/gtk+3/template +++ b/srcpkgs/gtk+3/template @@ -1,6 +1,6 @@ # Template build file for 'gtk+3'. pkgname=gtk+3 -version=3.22.22 +version=3.22.24 revision=1 wrksrc="gtk+-${version}" build_style=gnu-configure @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="https://www.gtk.org/" license="LGPL-2.1" distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz" -checksum=862dc22c5e93cd800753e5e90dfdb3af0fc760a47f6ebd918ae19136d527c6cd +checksum=cbb16e4cfc928ab8f5f22f7290616f95f6ebc8c97cc724a2007b07ced833592b hostmakedepends="automake gettext-devel libtool pkg-config glib-devel gtk-doc gobject-introspection gtk-update-icon-cache diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template index 11fbdae0b36..c4b646985ae 100644 --- a/srcpkgs/gtkmm/template +++ b/srcpkgs/gtkmm/template @@ -1,6 +1,6 @@ # Template build file for 'gtkmm'. pkgname=gtkmm -version=3.22.1 +version=3.22.2 revision=1 build_style=gnu-configure configure_args="--disable-documentation" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://gtkmm.sourceforge.net/" license="LGPL-2.1" distfiles="${GNOME_SITE}/gtkmm/${version%.*}/gtkmm-$version.tar.xz" -checksum=6a0c2cc0894a69b666e688e5e6e93621d7625db5e77fd37551310d75c00896b0 +checksum=91afd98a31519536f5f397c2d79696e3d53143b80b75778521ca7b48cb280090 pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/gtksourceview/template b/srcpkgs/gtksourceview/template index 4b67593ee1a..8636897f1f2 100644 --- a/srcpkgs/gtksourceview/template +++ b/srcpkgs/gtksourceview/template @@ -1,6 +1,6 @@ # Template file for 'gtksourceview' pkgname=gtksourceview -version=3.24.4 +version=3.24.5 revision=1 build_style=gnu-configure configure_args="--disable-static $(vopt_enable gir introspection)" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=207fb1958087d89393521eafac05f6dd67448ef6edb43ec2c708a79f3b1aa793 +checksum=0246185fcc20c4734d01419a83f58f251a82e2a902fe60bb0335187fcf658181 # Package build options build_options="gir" diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template index f6249a5f6d1..09a22f93a52 100644 --- a/srcpkgs/gvfs/template +++ b/srcpkgs/gvfs/template @@ -1,7 +1,7 @@ # Template file for 'gvfs' pkgname=gvfs version=1.34.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-hal --disable-libsystemd-login --with-bash-completion-dir=/usr/share/bash-completion/completions diff --git a/srcpkgs/gxkb/template b/srcpkgs/gxkb/template index b34c3a4d355..19fc2f5b718 100644 --- a/srcpkgs/gxkb/template +++ b/srcpkgs/gxkb/template @@ -1,6 +1,6 @@ # Template file for 'gxkb' pkgname=gxkb -version=0.7.9 +version=0.8.0 revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" @@ -9,8 +9,8 @@ short_desc="Lightweight GTK+2 X11 keyboard layout indicator and switcher" maintainer="Ivan Kozak " license="GPL-2" homepage="https://github.com/zen-tools/gxkb" -distfiles="https://github.com/zen-tools/${pkgname}/archive/v${version}.tar.gz" -checksum="964f814eba0ff7688b7a40a21d5c70f47b56a6242a3d36b713420e572bf4bba2" +distfiles="https://github.com/zen-tools/gxkb/archive/v${version}.tar.gz" +checksum=1f836ad42800914e97f49d54c2800595f7edf1c495c531b5c0a78ca870285e4e pre_configure() { ./autogen.sh diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template index 1f37bf8dc91..d4baec1c77d 100644 --- a/srcpkgs/harfbuzz/template +++ b/srcpkgs/harfbuzz/template @@ -1,6 +1,6 @@ # Template file for 'harfbuzz' pkgname=harfbuzz -version=1.5.1 +version=1.6.0 revision=1 build_style=gnu-configure configure_args="--with-glib --with-freetype --with-cairo --with-icu --with-graphite2" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/" license="MIT" distfiles="${FREEDESKTOP_SITE}/harfbuzz/release/${pkgname}-${version}.tar.bz2" -checksum=56838dfdad2729b8866763c82d623354d138a4d99d9ffb710c7d377b5cfc7c51 +checksum=5037ac0efc85a02a334965e66c1053d9dc9ed6833eae9739bd85bc33c83167c9 pre_configure() { autoreconf -fi diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template index 90a2a361839..4dd716973ac 100644 --- a/srcpkgs/help2man/template +++ b/srcpkgs/help2man/template @@ -1,7 +1,7 @@ # Template file for 'help2man' pkgname=help2man version=1.47.5 -revision=1 +revision=2 lib32disabled=yes build_style=gnu-configure hostmakedepends="perl-Locale-gettext" diff --git a/srcpkgs/hiera/template b/srcpkgs/hiera/template index 47678777a19..d59feeaec64 100644 --- a/srcpkgs/hiera/template +++ b/srcpkgs/hiera/template @@ -1,6 +1,6 @@ # Template file for 'hiera' pkgname=hiera -version=3.1.2 +version=3.4.2 revision=1 noarch=yes build_style=ruby-module @@ -12,4 +12,4 @@ maintainer="Juan RP " license="Apache-2.0" homepage="http://projects.puppetlabs.com/projects/hiera" distfiles="http://github.com/puppetlabs/$pkgname/archive/$version.tar.gz" -checksum=1bc14501cd5970f8273f1731b5bd0ab59edcb1a1e41e2deacc250388c68e1855 +checksum=7abcf3640d81bde31241b1c616bd1ee766a58bca3457ed9ddbe6f868fbd9c23a diff --git a/srcpkgs/hostapd/patches/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch b/srcpkgs/hostapd/patches/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch new file mode 120000 index 00000000000..cf437bbe51a --- /dev/null +++ b/srcpkgs/hostapd/patches/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch @@ -0,0 +1 @@ +../../wpa_supplicant/patches/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch \ No newline at end of file diff --git a/srcpkgs/hostapd/patches/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch b/srcpkgs/hostapd/patches/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch new file mode 120000 index 00000000000..d6b08173a04 --- /dev/null +++ b/srcpkgs/hostapd/patches/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch @@ -0,0 +1 @@ +../../wpa_supplicant/patches/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch \ No newline at end of file diff --git a/srcpkgs/hostapd/patches/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch b/srcpkgs/hostapd/patches/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch new file mode 120000 index 00000000000..7714b9f449b --- /dev/null +++ b/srcpkgs/hostapd/patches/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch @@ -0,0 +1 @@ +../../wpa_supplicant/patches/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch \ No newline at end of file diff --git a/srcpkgs/hostapd/patches/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch b/srcpkgs/hostapd/patches/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch new file mode 120000 index 00000000000..24059296513 --- /dev/null +++ b/srcpkgs/hostapd/patches/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch @@ -0,0 +1 @@ +../../wpa_supplicant/patches/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch \ No newline at end of file diff --git a/srcpkgs/hostapd/patches/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch b/srcpkgs/hostapd/patches/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch new file mode 120000 index 00000000000..aa99fe72a6f --- /dev/null +++ b/srcpkgs/hostapd/patches/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch @@ -0,0 +1 @@ +../../wpa_supplicant/patches/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch \ No newline at end of file diff --git a/srcpkgs/hostapd/patches/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch b/srcpkgs/hostapd/patches/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch new file mode 120000 index 00000000000..a078c74151b --- /dev/null +++ b/srcpkgs/hostapd/patches/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch @@ -0,0 +1 @@ +../../wpa_supplicant/patches/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch \ No newline at end of file diff --git a/srcpkgs/hostapd/patches/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch b/srcpkgs/hostapd/patches/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch new file mode 120000 index 00000000000..3b65e80f5b1 --- /dev/null +++ b/srcpkgs/hostapd/patches/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch @@ -0,0 +1 @@ +../../wpa_supplicant/patches/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch \ No newline at end of file diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template index 1cf9476f3c7..8a29e7811f3 100644 --- a/srcpkgs/hostapd/template +++ b/srcpkgs/hostapd/template @@ -1,7 +1,7 @@ # Template file for 'hostapd' pkgname=hostapd version=2.6 -revision=3 +revision=4 build_wrksrc=${pkgname} conf_files="/etc/hostapd/hostapd.conf" hostmakedepends="pkg-config" diff --git a/srcpkgs/hostfw/template b/srcpkgs/hostfw/template new file mode 100644 index 00000000000..4a93d4ac245 --- /dev/null +++ b/srcpkgs/hostfw/template @@ -0,0 +1,22 @@ +# Template file for 'hostfw' +pkgname=hostfw +version=0.6.1 +revision=1 +build_style=gnu-makefile +depends="iptables" +short_desc="Simple host-based permit-by-exception iptables generation script" +maintainer="Andrew Benson " +license="BSD" +homepage="https://github.com/abenson/hostfw/" +distfiles="https://github.com/abenson/hostfw/archive/v${version}.tar.gz" +checksum=5a27291222f2936e295ebc0a517931b5a261026f3c3b01b1bb688955c297ac1e + +do_install() { + vbin firewall + vman firewall.1 +} + +post_install() { + vlicense COPYING.md +} + diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template index abbde2d34d4..ef433a25920 100644 --- a/srcpkgs/hplip/template +++ b/srcpkgs/hplip/template @@ -1,12 +1,12 @@ # Template file for 'hplip' pkgname=hplip version=3.17.9 -revision=1 +revision=2 #XXX: pyqt pkgs for python gui hostmakedepends="pkg-config automake libtool python" makedepends="libressl-devel python-devel libxml2-python cups-devel sane-devel ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel" -depends="python-gobject2 python-dbus foomatic-db foomatic-db-engine desktop-file-utils" +depends="python-gobject2 python-dbus $(vopt_if gui python-PyQt4) foomatic-db foomatic-db-engine desktop-file-utils" conf_files="/etc/hp/hplip.conf" make_dirs="/var/lib/hp 0755 root root" pycompile_dirs="usr/share/hplip" @@ -17,6 +17,9 @@ license="GPL-2" distfiles="${SOURCEFORGE_SITE}/hplip/hplip/${version}/hplip-${version}.tar.gz" checksum=b2aad842f51dae7da2dd08d09ce2c27bc5f73c82a560b9494dd33589b0948678 +build_options="gui" +desc_option_gui="Build with Qt4 gui support" + CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/usr/include/python2.7" do_configure() { @@ -36,7 +39,7 @@ do_configure() { # do not install systemd service file sed -i '/[[:space:]]install-dist_rulessystemDATA/s,install-dist_rulessystemDATA,,' Makefile.in - ./configure ${configure_args} --disable-gui-build \ + ./configure ${configure_args} $(vopt_enable gui gui-build) \ --disable-foomatic-rip-hplip-install \ --enable-foomatic-ppd-install \ --enable-hpcups-install \ diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template index 92e0871d221..e11e4a05700 100644 --- a/srcpkgs/hugo/template +++ b/srcpkgs/hugo/template @@ -1,6 +1,6 @@ # Template file for 'hugo' pkgname=hugo -version=0.29 +version=0.30.2 revision=1 build_style=go hostmakedepends="git-perl mercurial" @@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni " license="SimPL-2" homepage="http://gohugo.io" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=8b8025472b7699e52a5f6b0cec0a5339130159b1d6ab5d281ed2fc69c97f48c0 +checksum=44a5012a0ee8a567cf12c8a5fd21de031e85148206a9d513942fd409f75b9a7d post_install() { vlicense LICENSE.md diff --git a/srcpkgs/i3lock/template b/srcpkgs/i3lock/template index 8b33014c204..842e82087a6 100644 --- a/srcpkgs/i3lock/template +++ b/srcpkgs/i3lock/template @@ -1,7 +1,7 @@ # Template file for 'i3lock' pkgname=i3lock version=2.9.1 -revision=1 +revision=2 hostmakedepends="pkg-config" makedepends="libev-devel cairo-devel pam-devel libxkbcommon-devel xcb-util-devel xcb-util-image-devel" @@ -20,4 +20,5 @@ do_build() { do_install() { make PREFIX=/usr DESTDIR=${DESTDIR} install vman i3lock.1 + vlicense LICENSE } diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template index f39b6258710..a4bcd5e7c33 100644 --- a/srcpkgs/ibus/template +++ b/srcpkgs/ibus/template @@ -1,6 +1,6 @@ # Template file for 'ibus' pkgname=ibus -version=1.5.14 +version=1.5.16 revision=1 build_style=gnu-configure configure_args="--enable-ui --enable-gtk3 --disable-python @@ -20,7 +20,7 @@ maintainer="Juan RP " homepage="https://github.com/ibus/ibus" license="LGPL-2.1" distfiles="https://github.com/ibus/ibus/releases/download/${version}/ibus-${version}.tar.gz" -checksum=a42b40fe4642f36bf2a6f0b4649f54f4043812d6bfee4faca38117799a009d3c +checksum=36b57bfbe4f92e3281fb535cae65794b6f25164b2a3288e73e6d06b4a409fe1e # Package build options build_options="gir ibus_setup" diff --git a/srcpkgs/ifupdown/patches/fix-musl.patch b/srcpkgs/ifupdown/patches/fix-musl.patch new file mode 100644 index 00000000000..83803ae4a2e --- /dev/null +++ b/srcpkgs/ifupdown/patches/fix-musl.patch @@ -0,0 +1,52 @@ +--- main.c ++++ main.c +@@ -19,6 +19,10 @@ + #include "archcommon.h" + #include "header.h" + ++#if !defined(FNM_EXTMATCH) ++#define FNM_EXTMATCH 0 ++#endif ++ + static const char *argv0; + bool no_act = false; + bool run_scripts = true; +--- archhurd.c ++++ archhurd.c +@@ -6,6 +6,10 @@ + + #include "archcommon.h" + ++#if !defined(FNM_EXTMATCH) ++#define FNM_EXTMATCH 0 ++#endif ++ + bool variable_match(const char *iface, const char *variable, const char *pattern) { + if (!strcasecmp(variable, "name")) + return fnmatch(pattern, iface, FNM_EXTMATCH) == 0; +--- archkfreebsd.c ++++ archkfreebsd.c +@@ -9,6 +9,10 @@ + + #include "archcommon.h" + ++#if !defined(FNM_EXTMATCH) ++#define FNM_EXTMATCH 0 ++#endif ++ + static bool match_mac(const char *iface, const char *pattern) { + for (struct ifaddrs *ifa = ifap; ifa; ifa = ifa->ifa_next) { + if (ifa->ifa_addr->sa_family != AF_LINK) +--- archlinux.c ++++ archlinux.c +@@ -10,6 +10,10 @@ + + #include "archcommon.h" + ++#if !defined(FNM_EXTMATCH) ++#define FNM_EXTMATCH 0 ++#endif ++ + bool variable_match(const char *iface, const char *variable, const char *pattern) { + // Map platform-independent variables to sysfs names + if(!strcasecmp(variable, "mac")) diff --git a/srcpkgs/ifupdown/template b/srcpkgs/ifupdown/template index c12b8766a7a..c6a1f34223c 100644 --- a/srcpkgs/ifupdown/template +++ b/srcpkgs/ifupdown/template @@ -1,7 +1,7 @@ # Template file for 'ifupdown' pkgname=ifupdown version=0.8.25 -revision=1 +revision=2 wrksrc=$pkgname build_style=gnu-makefile make_use_env=1 @@ -20,11 +20,6 @@ make_dirs="/etc/network/interfaces.d 0755 root root /etc/network/if-post-down.d 0755 root root" conf_files="/etc/network/interfaces" -case "${XBPS_TARGET_MACHINE}" in - *-musl) broken=https://travis-ci.org/the-maldridge/void-packages/jobs/255103617 -esac - - post_install() { vman interfaces.5 vman ifup.8 diff --git a/srcpkgs/itstool/template b/srcpkgs/itstool/template index 29bb7f920f7..b9c21a962df 100644 --- a/srcpkgs/itstool/template +++ b/srcpkgs/itstool/template @@ -1,6 +1,6 @@ # Template file for 'itstool' pkgname=itstool -version=2.0.3 +version=2.0.4 revision=1 noarch=yes build_style=gnu-configure @@ -13,4 +13,4 @@ maintainer="Juan RP " license="GPL-3" homepage="http://itstool.org/" distfiles="http://files.itstool.org/itstool/$pkgname-$version.tar.bz2" -checksum=8c7a5c639eb4714a91ad829910fd06c1c677abcbbb60aee9211141faa7fb02c7 +checksum=97c208b51da33e0b553e830b92655f8deb9132f8fbe9a646771f95c33226eb60 diff --git a/srcpkgs/jgmenu/template b/srcpkgs/jgmenu/template index 59edc449300..975a7b9e4e1 100644 --- a/srcpkgs/jgmenu/template +++ b/srcpkgs/jgmenu/template @@ -1,6 +1,6 @@ # Template file for 'jgmenu' pkgname=jgmenu -version=0.7.1 +version=0.7.2 revision=1 build_style=gnu-makefile make_use_env=yes @@ -14,4 +14,4 @@ short_desc="Small X11 menu intended to be used with openbox and tint2" homepage="https://www.github.com/johanmalm/jgmenu" license="GPL-2" distfiles="https://www.github.com/johanmalm/jgmenu/archive/v${version}.tar.gz" -checksum=a7424173dcb8d66fc978e1162fe5ee25977b891dd370404569bb213823711d82 +checksum=256b8cc01d792b4517120a92aee373f540ba6a2b7a684c0dbc301119a3a21e2b diff --git a/srcpkgs/kapow/template b/srcpkgs/kapow/template new file mode 100644 index 00000000000..3a7ec90bbdb --- /dev/null +++ b/srcpkgs/kapow/template @@ -0,0 +1,13 @@ +# Template file for 'kapow' +pkgname=kapow +version=1.5.3 +revision=1 +build_style=qmake +hostmakedepends="pkg-config qt5-qmake qt5-tools-devel" +makedepends="qt5-devel" +short_desc="Simple punch-clock style time tracker" +maintainer="Jakub Skrzypnik " +license="GPL-3" +homepage="https://gottcode.org/kapow/" +distfiles="https://gottcode.org/${pkgname}/${pkgname}-${version}-src.tar.bz2" +checksum="73953d980e248ccf74c8b94c62ee1dbeaa9843481ca87a8e6af7fe1c2eb8c712" diff --git a/srcpkgs/kbdd/template b/srcpkgs/kbdd/template new file mode 100644 index 00000000000..539054c3dde --- /dev/null +++ b/srcpkgs/kbdd/template @@ -0,0 +1,22 @@ +# Template file for 'kbdd' +pkgname=kbdd +version=0.7.1 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config libtool automake dbus-glib-devel glib-devel" +makedepends="libX11-devel dbus-glib-devel glib-devel" +depends="libX11" +short_desc="Simple daemon and library to make per window layout using XKB" +maintainer="SolitudeSF " +license="GPL-2" +homepage="https://github.com/qnikst/kbdd" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=17b3ee6054e86f9d54e70023582061f287a14a96bd8841a99b61921f3a3b165a + +pre_configure() { + libtoolize --force + aclocal + autoheader + automake --force-missing --add-missing + autoreconf -i +} diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template index e23ab100793..e61a279fe09 100644 --- a/srcpkgs/keepalived/template +++ b/srcpkgs/keepalived/template @@ -1,6 +1,6 @@ # Template file for 'keepalived' pkgname=keepalived -version=1.3.7 +version=1.3.8 revision=1 conf_files="/etc/${pkgname}/${pkgname}.conf" build_style=gnu-configure @@ -12,7 +12,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.keepalived.org/" distfiles="http://www.keepalived.org/software/$pkgname-$version.tar.gz" -checksum=0a9f9e5eb598fc63401c90855d9cd0b3cb4345a392dd72e7d0ae559a2ee22f97 +checksum=d484af06a79693f553870d4cb5ab3f4053397eefd59036d5c03210c5326ad073 post_install() { vsv $pkgname diff --git a/srcpkgs/ksysguard/patches/Fix-compilation-with-strict-libc-(such-as-musl).patch b/srcpkgs/ksysguard/patches/Fix-compilation-with-strict-libc-(such-as-musl).patch new file mode 100644 index 00000000000..c7f15f845ab --- /dev/null +++ b/srcpkgs/ksysguard/patches/Fix-compilation-with-strict-libc-(such-as-musl).patch @@ -0,0 +1,126 @@ +--- ksysguardd/Command.c ++++ ksysguardd/Command.c +@@ -19,6 +19,7 @@ + + */ + ++#define _POSIX_C_SOURCE /* sig.*set */ + #include + #include + #include +--- ksysguardd/Linux/ProcessList.c ++++ ksysguardd/Linux/ProcessList.c +@@ -18,6 +18,9 @@ + + */ + ++#define _BSD_SOURCE /* kill, syscall */ ++#define _DEFAULT_SOURCE /* Eliminate warning from prev */ ++ + #include + #include + #include +@@ -29,6 +32,7 @@ + #include + #include + #include ++#include + #include + #include + +--- ksysguardd/Linux/diskstat.c ++++ ksysguardd/Linux/diskstat.c +@@ -20,6 +20,8 @@ + + #include + ++#define _XOPEN_SOURCE /* isascii */ ++ + #include + #include + #include +@@ -63,8 +65,10 @@ char *getMntPnt( const char* cmd ) + memset( device, 0, sizeof( device ) ); + sscanf( cmd, "partitions%1024s", device ); + +- ptr = (char*)rindex( device, '/' ); +- *ptr = '\0'; ++ ptr = strrchr( device, '/' ); ++ if( ptr ) { ++ *ptr = '\0'; ++ } + + return (char*)device; + } +--- ksysguardd/Linux/netstat.c ++++ ksysguardd/Linux/netstat.c +@@ -20,8 +20,11 @@ + + #include + ++#define _POSIX_SOURCE /* expose old gethostbyaddr(3) call */ + #include + #include ++#include ++#include + #include + #include + #include +@@ -264,10 +267,10 @@ updateNetStatTcpUdpRaw(const char *cmd) + { + FILE *netstat; + char buffer[1024]; +- uint local_addr, local_port; +- uint remote_addr, remote_port; ++ unsigned local_addr, local_port; ++ unsigned remote_addr, remote_port; + int uid; +- uint state; ++ unsigned state; + SocketInfo *socket_info; + + if (strstr(cmd, "tcp")) { +--- ksysguardd/Linux/softraid.c ++++ ksysguardd/Linux/softraid.c +@@ -21,6 +21,7 @@ + #include "ksysguardd.h" + #include "softraid.h" + ++#define _POSIX_C_SOURCE 200809L /* strndup */ + #include /* for strlen, strcat and strcmp */ + #include /* for sprintf */ + #include /* for open */ +--- ksysguardd/PWUIDCache.c ++++ ksysguardd/PWUIDCache.c +@@ -18,6 +18,8 @@ + + */ + ++#define _POSIX_C_SOURCE 200809L /* strdup */ ++ + #include + #include + #include +--- ksysguardd/conf.c ++++ ksysguardd/conf.c +@@ -20,6 +20,7 @@ + + #include "config-ksysguardd.h" + ++#define _POSIX_C_SOURCE 200809L /* strdup */ + #include + #include + #include +--- ksysguardd/ksysguardd.c ++++ ksysguardd/ksysguardd.c +@@ -22,6 +22,9 @@ + + */ + ++/* strdup, fileno, fdopen */ ++#define _POSIX_C_SOURCE 200809L ++ + #include + #include + #include + diff --git a/srcpkgs/ksysguard/template b/srcpkgs/ksysguard/template index c09fea095d3..80853b9b4b9 100644 --- a/srcpkgs/ksysguard/template +++ b/srcpkgs/ksysguard/template @@ -13,7 +13,3 @@ license="GPL-2" homepage="https://projects.kde.org/projects/plasma/ksysguard" distfiles="http://download.kde.org/stable/plasma/${version}/${pkgname}-${version}.tar.xz" checksum=ab69a8f3c8d21422b17e689dc0cf1b2137723dafded343ad3ea8db1802014080 - -case "$XBPS_TARGET_MACHINE" in - *-musl) broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/4687/steps/shell_3/logs/stdio";; -esac diff --git a/srcpkgs/l-smash/template b/srcpkgs/l-smash/template new file mode 100644 index 00000000000..28ec0d8e977 --- /dev/null +++ b/srcpkgs/l-smash/template @@ -0,0 +1,40 @@ +# Template file for 'l-smash' +pkgname=l-smash +version=2.9.1 +revision=1 +build_style=configure +configure_args="--enable-shared --disable-static" +short_desc="MP4 muxer and other tools" +maintainer="DirectorX " +license="ISC" +homepage="https://github.com/l-smash/l-smash" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=17f24fc8bffba753f8c628f1732fc3581b80362341274747ef6fb96af1cac45c + +do_configure() { + : ${configure_script:=./configure} + ${configure_script} ${configure_args} --cc="${CC}" \ + --extra-cflags="${CFLAGS}" --extra-ldflags="${LDFLAGS}" \ + --prefix=/usr +} + +post_install() { + vlicense LICENSE +} + +liblsmash-devel_package() { + depends="liblsmash>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} + +liblsmash_package() { + short_desc+=" - runtime library" + pkg_install() { + vmove "usr/lib/*.so.*" + } +} diff --git a/srcpkgs/lame/template b/srcpkgs/lame/template index f00d90c658d..297770a3b7b 100644 --- a/srcpkgs/lame/template +++ b/srcpkgs/lame/template @@ -1,7 +1,7 @@ # Template file for 'lame' pkgname=lame -version=3.99.5 -revision=2 +version=3.100 +revision=1 build_style=gnu-configure configure_args="--enable-nasm --enable-shared" hostmakedepends="nasm" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://lame.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/lame/lame-${version}.tar.gz" -checksum=24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff +checksum=ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e pre_configure() { if [ "${XBPS_TARGET_MACHINE%%-musl}" = "i686" ]; then diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template index 04a63225ffa..e86ca98a924 100644 --- a/srcpkgs/libGL/template +++ b/srcpkgs/libGL/template @@ -1,6 +1,6 @@ # Template build file for 'libGL'. pkgname=libGL -version=17.2.2 +version=17.2.3 revision=1 wrksrc="mesa-${version}" build_style=gnu-configure @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://www.mesa3d.org/" license="MIT, LGPL-2.1" distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" -checksum=cf522244d6a5a1ecde3fc00e7c96935253fe22f808f064cab98be6f3faa65782 +checksum=a0b0ec8f7b24dd044d7ab30a8c7e6d3767521e245f88d4ed5dd93315dc56f837 hostmakedepends=" automake libtool flex pkg-config llvm python-Mako libxml2-python diff --git a/srcpkgs/libXfont/template b/srcpkgs/libXfont/template index fdfccd204c7..1bf59238f5d 100644 --- a/srcpkgs/libXfont/template +++ b/srcpkgs/libXfont/template @@ -1,6 +1,6 @@ # Template build file for 'libXfont'. pkgname=libXfont -version=1.5.2 +version=1.5.3 revision=1 hostmakedepends="pkg-config" makedepends="xproto xtrans fontcacheproto fontsproto freetype-devel libfontenc-devel" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" license="MIT" distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" -checksum=02945ea68da447102f3e6c2b896c1d2061fd115de99404facc2aca3ad7010d71 +checksum=ab85c10fd2683481dfef672a77fe60e6a2039558cbc0e9bf56b5e1df471c93d0 post_install() { vlicense COPYING diff --git a/srcpkgs/libaccounts-glib/template b/srcpkgs/libaccounts-glib/template index 22cd757cb92..27a04d692c3 100644 --- a/srcpkgs/libaccounts-glib/template +++ b/srcpkgs/libaccounts-glib/template @@ -1,6 +1,6 @@ # Template file for 'libaccounts-glib' pkgname=libaccounts-glib -version=1.21 +version=1.23 revision=1 build_style=gnu-configure short_desc="GLib-based client library for the accounts database" @@ -8,10 +8,10 @@ maintainer="John Rowley " license="LGPL-2.1" homepage="https://gitlab.com/accounts-sso/libaccounts-glib" distfiles="https://gitlab.com/accounts-sso/${pkgname}/repository/archive.tar.gz?ref=VERSION_${version}>${pkgname}-${version}.tar.gz" -checksum="27cb75f3f2f0ce736b77f0fd0432f8d565297f0735846a2862577eadaec92488" +checksum=b4686af19b86cbedc0eb6a00aceee70f2c61254013d2cadd8aba15e9c540fff7 hostmakedepends="gtk-doc autoconf automake libtool pkg-config glib-devel" makedepends="sqlite-devel libxml2-devel libglib-devel" -wrksrc="${pkgname}-VERSION_${version}-00254a604a7c7bd38c41794a80ad8930e90f21aa" +wrksrc="${pkgname}-VERSION_${version}-8d14b10652b2fe6c25d8ad8334e2d5023d254313" pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/libax25/update b/srcpkgs/libax25/update new file mode 100644 index 00000000000..108668adbd1 --- /dev/null +++ b/srcpkgs/libax25/update @@ -0,0 +1 @@ +site=http://www.linux-ax25.org/pub/libax25/ diff --git a/srcpkgs/libextractor/template b/srcpkgs/libextractor/template index 2d41f98938a..a08c6a55df4 100644 --- a/srcpkgs/libextractor/template +++ b/srcpkgs/libextractor/template @@ -1,6 +1,6 @@ # Template file for 'libextractor' pkgname=libextractor -version=1.5 +version=1.6 revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -13,7 +13,7 @@ maintainer="Martin Riese " license="GPL-3" homepage="https://www.gnu.org/software/libextractor/" distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" -checksum=e0c0305b1356d0cf2fc2db0784e4e5ae8c44121e1e5c6424552d9f9271943553 +checksum=26d4adca2e381d2a0c8b3037ec85e094ac5d40485623794466cfc176f5bbf69d post_install() { sed -i "s|\(-specs=.*hardened-ld\)||g" ${DESTDIR}/usr/lib/pkgconfig/libextractor.pc diff --git a/srcpkgs/libfastjson/template b/srcpkgs/libfastjson/template index fc1ad1d58c3..eb1b1c15de7 100644 --- a/srcpkgs/libfastjson/template +++ b/srcpkgs/libfastjson/template @@ -1,6 +1,6 @@ # Template file for 'libfastjson' pkgname=libfastjson -version=0.99.6 +version=0.99.7 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" @@ -9,7 +9,7 @@ maintainer="Michael Gehring " license="MIT" homepage="https://github.com/rsyslog/libfastjson" distfiles="https://github.com/rsyslog/libfastjson/archive/v${version}.tar.gz" -checksum=617373e5205c84b5f674354df6ee9cba53ef8a227f0d1aa928666ed8a16d5547 +checksum=a142a6e5fa5c9c4ac32615c42fc663a1a14bff305c922e55192b6abf7d1ce1d8 pre_configure() { autoreconf -fi diff --git a/srcpkgs/libffms2 b/srcpkgs/libffms2 new file mode 120000 index 00000000000..7841b14b892 --- /dev/null +++ b/srcpkgs/libffms2 @@ -0,0 +1 @@ +ffms2 \ No newline at end of file diff --git a/srcpkgs/libffms2-devel b/srcpkgs/libffms2-devel new file mode 120000 index 00000000000..7841b14b892 --- /dev/null +++ b/srcpkgs/libffms2-devel @@ -0,0 +1 @@ +ffms2 \ No newline at end of file diff --git a/srcpkgs/libgfshare-maketable b/srcpkgs/libgfshare-maketable deleted file mode 120000 index aa3e61c7b48..00000000000 --- a/srcpkgs/libgfshare-maketable +++ /dev/null @@ -1 +0,0 @@ -libgfshare \ No newline at end of file diff --git a/srcpkgs/libgphoto2/template b/srcpkgs/libgphoto2/template index 6bc378d9f63..7fe29be25e2 100644 --- a/srcpkgs/libgphoto2/template +++ b/srcpkgs/libgphoto2/template @@ -1,6 +1,6 @@ # Template file for 'libgphoto2' pkgname=libgphoto2 -version=2.5.14 +version=2.5.16 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-rpath udevscriptdir=/usr/lib/udev" @@ -13,7 +13,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.gphoto.org" distfiles="${SOURCEFORGE_SITE}/gphoto/$pkgname-$version.tar.bz2" -checksum=d3ce70686fb87d6791b9adcbb6e5693bfbe1cfef9661c23c75eb8a699ec4e274 +checksum=e757416d1623e01a9d0d294b2e790162e434c0964f50d3b7ff1a3424b62a2906 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" libgphoto2" diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template index 95584c99209..c9ca55b8e60 100644 --- a/srcpkgs/libguestfs/template +++ b/srcpkgs/libguestfs/template @@ -1,6 +1,6 @@ # Template file for 'libguestfs' pkgname=libguestfs -version=1.37.29 +version=1.37.31 revision=1 _version_short=${version%.*} build_style=gnu-configure @@ -22,7 +22,7 @@ maintainer="Andrea Brancaleoni " license="GPL-2" homepage="http://libguestfs.org" distfiles="http://libguestfs.org/download/$_version_short-development/$pkgname-$version.tar.gz" -checksum=24fc9e576a89d768e044424fdb64178f608efaf94cc601be094fdb3e5dbfdec4 +checksum=fda37c1af6d902103db4cb6a81441dd572005f9b9ced0b81fdf5631da3a85f4f conf_files="etc/libguestfs-tools.conf etc/xdg/virt-builder/repos.d/libguestfs.conf diff --git a/srcpkgs/liblsmash b/srcpkgs/liblsmash new file mode 120000 index 00000000000..c4a1d43bcee --- /dev/null +++ b/srcpkgs/liblsmash @@ -0,0 +1 @@ +l-smash \ No newline at end of file diff --git a/srcpkgs/liblsmash-devel b/srcpkgs/liblsmash-devel new file mode 120000 index 00000000000..c4a1d43bcee --- /dev/null +++ b/srcpkgs/liblsmash-devel @@ -0,0 +1 @@ +l-smash \ No newline at end of file diff --git a/srcpkgs/libmpdclient/template b/srcpkgs/libmpdclient/template index 54f38eadc14..6ec0da1d1db 100644 --- a/srcpkgs/libmpdclient/template +++ b/srcpkgs/libmpdclient/template @@ -1,7 +1,7 @@ # Template file for 'libmpdclient' pkgname=libmpdclient version=2.13 -revision=1 +revision=2 build_style=meson short_desc="Asynchronous API library for interfacing MPD" maintainer="Juan RP " @@ -11,6 +11,10 @@ homepage="http://www.musicpd.org/libs/libmpdclient/" distfiles="http://www.musicpd.org/download/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=5115bd52bc20a707c1ecc7587e6389c17305348e2132a66cf767c62fc55ed45d +post_install() { + vlicense COPYING +} + libmpdclient-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/libmusicbrainz5/template b/srcpkgs/libmusicbrainz5/template index ea1579e6de3..f08ed8fa52b 100644 --- a/srcpkgs/libmusicbrainz5/template +++ b/srcpkgs/libmusicbrainz5/template @@ -1,7 +1,7 @@ # Template file for 'libmusicbrainz5' pkgname=libmusicbrainz5 version=5.1.0 -revision=2 +revision=3 build_style=cmake wrksrc="libmusicbrainz-${version}" hostmakedepends="pkg-config" @@ -13,6 +13,24 @@ homepage="http://musicbrainz.org/" distfiles="https://github.com/metabrainz/libmusicbrainz/releases/download/release-${version}/libmusicbrainz-${version}.tar.gz" checksum=6749259e89bbb273f3f5ad7acdffb7c47a2cf8fcaeab4c4695484cef5f4c6b46 +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" ${makedepends}" +fi + +pre_configure() { + # Building for the host architecture is needed to generate C interface source files + # see https://github.com/metabrainz/libmusicbrainz/blob/master/INSTALL.txt + if [ "$CROSS_BUILD" ]; then + mkdir build-native + cd build-native + CC=${CC_host} CFLAGS=${XBPS_CFLAGS} CXX=${CXX_host} \ + CXXFLAGS=${XBPS_CXXFLAGS} LDFLAGS=${XBPS_LDFLAGS} cmake .. + make -j ${makejobs} make-c-interface + configure_args+=" -DIMPORT_EXECUTABLES=../build-native/ImportExecutables.cmake" + cd .. + fi +} + libmusicbrainz5-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" -- development files" diff --git a/srcpkgs/libnfs/patches/sysmacros_makedev.patch b/srcpkgs/libnfs/patches/sysmacros_makedev.patch deleted file mode 100644 index 1e48d2f953e..00000000000 --- a/srcpkgs/libnfs/patches/sysmacros_makedev.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- lib/libnfs.c 2016-10-09 20:23:11.000000000 +0200 -+++ lib/libnfs.c 2017-02-09 22:11:03.882598292 +0100 -@@ -64,14 +64,6 @@ - #include - #endif - --#ifdef MAJOR_IN_MKDEV --#include --#endif -- --#ifdef MAJOR_IN_SYSMACROS --#include --#endif -- - #include - #include - #include -@@ -82,6 +74,7 @@ - #include - #include - #include -+#include - #include "libnfs-zdr.h" - #include "slist.h" - #include "libnfs.h" diff --git a/srcpkgs/libnfs/template b/srcpkgs/libnfs/template index 5d5ed8d32da..840922317ec 100644 --- a/srcpkgs/libnfs/template +++ b/srcpkgs/libnfs/template @@ -1,7 +1,7 @@ # Template file for 'libnfs' pkgname=libnfs -version=1.11.0 -revision=2 +version=2.0.0 +revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure hostmakedepends="libtool pkg-config automake" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="https://github.com/sahlberg/libnfs" license="GPL-2" distfiles="https://github.com/sahlberg/libnfs/archive/$pkgname-${version}.tar.gz" -checksum=fc2e45df14d8714ccd07dc2bbe919e45a2e36318bae7f045cbbb883a7854640f +checksum=7ea6cd8fa6c461d01091e584d424d28e137d23ff4b65b95d01a3fd0ef95d120e pre_configure() { autoreconf -fi diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template index 458df6facc7..afe51900808 100644 --- a/srcpkgs/libopenshot/template +++ b/srcpkgs/libopenshot/template @@ -1,13 +1,14 @@ # Template file for 'libopenshot' pkgname=libopenshot -version=0.1.7 -revision=3 +version=0.1.8 +revision=1 build_style=cmake only_for_archs="i686 x86_64" pycompile_module="openshot.py" +configure_args="-DENABLE_RUBY=OFF" # Builds fail with Ruby-2.4.1 hostmakedepends="swig doxygen ruby python3" makedepends="python3-devel ffmpeg-devel libmagick-devel qt5-devel libgomp-devel - libopenshot-audio-devel qt5-multimedia-devel ruby-devel x264-devel x265-devel unittest-cpp + libopenshot-audio-devel qt5-multimedia-devel x264-devel x265-devel unittest-cpp zeromq-devel" depends="python3" short_desc="Library files for the OpenShot video editor" @@ -15,7 +16,7 @@ maintainer="Spencer Hill " license="LGPL-3" homepage="https://github.com/OpenShot/libopenshot" distfiles="https://github.com/OpenShot/libopenshot/archive/v${version}.tar.gz" -checksum=71cf5c18c76c36bec40c775cb98ab1ed672aa48d2de63a26c33c5cc5d6f0875a +checksum=a9b0706433c5c0e6edc9b1cc3c0ff1af4c8b7e8e31b5e071445a113fbb365d45 libopenshot-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/libsoup/template b/srcpkgs/libsoup/template index bb7956d1c64..a6c336472c7 100644 --- a/srcpkgs/libsoup/template +++ b/srcpkgs/libsoup/template @@ -1,6 +1,6 @@ # Template file for 'libsoup' pkgname=libsoup -version=2.60.0 +version=2.60.1 revision=1 build_style=gnu-configure configure_args="--disable-tls-check --disable-static @@ -13,7 +13,7 @@ maintainer="Enno Boland " homepage="http://www.gnome.org" license="LGPL-2.1" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=b324edbecda0884143c0853b4a2bd5bd37fb3761f12f293c621ff34b9acdc84c +checksum=023930032b20e6b14764feb847ea80d9e170622dee7370215d6feb9967b6aa9d # Package build options build_options="gir" diff --git a/srcpkgs/libtar/template b/srcpkgs/libtar/template index e0a00f0fd0b..5dcc1e1ca2a 100644 --- a/srcpkgs/libtar/template +++ b/srcpkgs/libtar/template @@ -1,7 +1,7 @@ # Template file for 'libtar' pkgname=libtar version=1.2.20 -revision=1 +revision=2 wrksrc="$pkgname" build_style=gnu-configure hostmakedepends="automake libtool pkg-config" @@ -13,6 +13,10 @@ homepage="http://www.feep.net/libtar/" distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/libtar-${version}.tar.gz" checksum=43c5f50e6b4398c8be35d6f3abee26064c3f26174715b60004576792e3283353 +post_install() { + vlicense COPYRIGHT +} + pre_configure() { autoreconf -fi } diff --git a/srcpkgs/libupnp/template b/srcpkgs/libupnp/template index 1937cf6e71f..123171987a2 100644 --- a/srcpkgs/libupnp/template +++ b/srcpkgs/libupnp/template @@ -1,7 +1,7 @@ # Template file for 'libupnp' pkgname=libupnp version=1.6.22 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool" short_desc="A Portable Open Source UPnP Development Kit" @@ -11,6 +11,10 @@ homepage="http://pupnp.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/pupnp/$pkgname-$version.tar.bz2" checksum=0bdfacb7fa8d99b78343b550800ff193264f92c66ef67852f87f042fd1a1ebbc +post_install() { + vlicense LICENSE +} + pre_configure() { autoreconf -fi } diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template index c091dcd0a19..9180ad41a67 100644 --- a/srcpkgs/libvirt/template +++ b/srcpkgs/libvirt/template @@ -1,6 +1,6 @@ # Template file for 'libvirt' pkgname=libvirt -version=3.7.0 +version=3.8.0 revision=1 build_style=gnu-configure patch_args="-Np1" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="https://libvirt.org" license="LGPL-2.1" distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz" -checksum=4e7bcb209eeef99f026484293abc733e30ed06dabcdde62c4c3e95f71b2b67ba +checksum=73eba834089ed0ce74e3183a7f12cf0c6f7de08e9a700b5456c62fb124f903f9 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649 system_accounts="libvirt" diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template index 63d725f788b..78e282cc5e5 100644 --- a/srcpkgs/libwebsockets/template +++ b/srcpkgs/libwebsockets/template @@ -1,6 +1,6 @@ # Template file for 'libwebsockets' pkgname=libwebsockets -version=2.3.0 +version=2.4.0 revision=1 build_style=cmake makedepends="zlib-devel libressl-devel libev-devel" @@ -10,7 +10,7 @@ maintainer="Enno Boland " license="LGPL-2" homepage="https://libwebsockets.org" distfiles="https://github.com/warmcat/libwebsockets/archive/v$version.tar.gz" -checksum=f08a8233ca1837640b72b1790cce741ce4b0feaaa6b408fe28a303cbf0408fa1 +checksum=0dc355c1f9a660b98667cc616fa4c4fe08dacdaeff2d5cc9f74e49e9d4af2d95 CFLAGS="-Wno-error" diff --git a/srcpkgs/libwpd/template b/srcpkgs/libwpd/template index baacec0aebc..ea435c93932 100644 --- a/srcpkgs/libwpd/template +++ b/srcpkgs/libwpd/template @@ -1,6 +1,6 @@ # Template file for 'libwpd' pkgname=libwpd -version=0.10.1 +version=0.10.2 revision=1 build_style=gnu-configure short_desc="Library for importing WordPerfect documents" @@ -10,7 +10,7 @@ makedepends="librevenge-devel" hostmakedepends="pkg-config" homepage="http://libwpd.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/libwpd/libwpd-${version}.tar.xz" -checksum=09d3410bc770f9d9eedc8544b5c211771ea3322de3fee19b58ad7d40fb2984f6 +checksum=323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610 libwpd-devel_package() { depends="libwpd>=${version}_${revision} $makedepends" diff --git a/srcpkgs/libwpg/template b/srcpkgs/libwpg/template index 58e3356abd5..b96a145b1b7 100644 --- a/srcpkgs/libwpg/template +++ b/srcpkgs/libwpg/template @@ -1,6 +1,6 @@ # Template file for 'libwpg' pkgname=libwpg -version=0.3.1 +version=0.3.2 revision=1 build_style=gnu-configure short_desc="Library for importing WordPerfect Graphics" @@ -10,7 +10,7 @@ makedepends="libwpd-devel librevenge-devel" hostmakedepends="pkg-config" homepage="http://libwpg.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/libwpg/libwpg-${version}.tar.xz" -checksum=620d888c10d7e1127d5123ff0065f1b62b86b91bac27d8ae10dcfbdb6bf4278f +checksum=57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33 libwpg-devel_package() { depends="libwpg>=${version}_${revision} $makedepends" diff --git a/srcpkgs/lilo/patches/remove___GLIBC__.patch b/srcpkgs/lilo/patches/remove___GLIBC__.patch new file mode 100644 index 00000000000..4bffb96c631 --- /dev/null +++ b/srcpkgs/lilo/patches/remove___GLIBC__.patch @@ -0,0 +1,10 @@ +--- src/lilo.c ++++ src/lilo.c +@@ -182,7 +182,6 @@ extern int has_partitions_beta(dev_t dev); /* defined in geometry.c */ + printf("Without"); + #endif + printf(" device-mapper\n"); +- printf("\nglibc version %d.%d\n", __GLIBC__, __GLIBC_MINOR__); + printf("Kernel Headers included from %d.%d.%d\n", + LINUX_VERSION_CODE>>16, + LINUX_VERSION_CODE>>8 & 255, diff --git a/srcpkgs/lilo/template b/srcpkgs/lilo/template index 597a9c62eb8..99172925886 100644 --- a/srcpkgs/lilo/template +++ b/srcpkgs/lilo/template @@ -1,7 +1,7 @@ # Template file for 'lilo' pkgname=lilo version=24.2 -revision=1 +revision=2 only_for_archs="i686 i686-musl x86_64 x86_64-musl" hostmakedepends="bin86" makedepends="device-mapper-devel" @@ -40,4 +40,6 @@ do_install() { etc/kernel.d/post-install 50-lilo vinstall ${FILESDIR}/kernel.d/lilo.post-remove 750 \ etc/kernel.d/post-remove 50-lilo + + vlicense COPYING } diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template index 657478bc93e..094b7288e51 100644 --- a/srcpkgs/linux/template +++ b/srcpkgs/linux/template @@ -1,6 +1,6 @@ # Template file for 'linux' pkgname=linux -version=4.12 +version=4.13 revision=1 build_style=meta homepage="http://www.voidlinux.eu/" diff --git a/srcpkgs/linux4.12/template b/srcpkgs/linux4.12/template index ed1ddfa6d18..6d6b5bfb982 100644 --- a/srcpkgs/linux4.12/template +++ b/srcpkgs/linux4.12/template @@ -1,6 +1,6 @@ # Template file for 'linux4.12' pkgname=linux4.12 -version=4.12.13 +version=4.12.14 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=896eb29ccb9fb17f16cc50bee87a47cbc436343850cd1ad038ca3bc2ebe15da3 +checksum=86ab3f45b1aff5f8a9ec72c232bccf5a314edb2a09fb8664c5902b03edacfd27 nodebug=yes # -dbg package is generated below manually nostrip=yes diff --git a/srcpkgs/linux4.13/template b/srcpkgs/linux4.13/template index 533729dd0b5..d39a2029efd 100644 --- a/srcpkgs/linux4.13/template +++ b/srcpkgs/linux4.13/template @@ -1,6 +1,6 @@ # Template file for 'linux4.13' pkgname=linux4.13 -version=4.13.6 +version=4.13.8 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=47d419ceae1d353dad565b858301ac9670c747deb37936c8a935915b3bdd6050 +checksum=64e68ca8223c65282d4fc16e0839f2fa7629b151cb6874aeb19dc8c4ef23f427 nodebug=yes # -dbg package is generated below manually nostrip=yes diff --git a/srcpkgs/linux4.9/files/i386-dotconfig b/srcpkgs/linux4.9/files/i386-dotconfig index 434efef27da..ecdec720ea7 100644 --- a/srcpkgs/linux4.9/files/i386-dotconfig +++ b/srcpkgs/linux4.9/files/i386-dotconfig @@ -7684,6 +7684,7 @@ CONFIG_PUNIT_ATOM_DEBUG=m # CONFIG_KEYS=y # CONFIG_PERSISTENT_KEYRINGS is not set +# CONFIG_BIG_KEYS is not set CONFIG_TRUSTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m # CONFIG_KEY_DH_OPERATIONS is not set diff --git a/srcpkgs/linux4.9/files/x86_64-dotconfig b/srcpkgs/linux4.9/files/x86_64-dotconfig index 626db112fbb..366643be687 100644 --- a/srcpkgs/linux4.9/files/x86_64-dotconfig +++ b/srcpkgs/linux4.9/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.9.26 Kernel Configuration +# Linux/x86_64 4.9.56 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -7803,6 +7803,7 @@ CONFIG_X86_DEBUG_FPU=y # CONFIG_KEYS=y # CONFIG_PERSISTENT_KEYRINGS is not set +# CONFIG_BIG_KEYS is not set CONFIG_TRUSTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m # CONFIG_KEY_DH_OPERATIONS is not set diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template index 59ead1c9f59..7daa912e8dc 100644 --- a/srcpkgs/linux4.9/template +++ b/srcpkgs/linux4.9/template @@ -1,6 +1,6 @@ # Template file for 'linux4.9' pkgname=linux4.9 -version=4.9.51 +version=4.9.56 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="https://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=83faa66102d8a4c164857014c5304e08ca6c16f1697851862af17ba61378aa8a +checksum=11d22bdbbca9b74663cfbf6265883494ffa96bcfd8d2d09b55b30b922370d3ca nodebug=yes # -dbg package is generated below manually nostrip=yes diff --git a/srcpkgs/luafilesystem/template b/srcpkgs/luafilesystem/template index fbb6a9abf0a..dc0b13a7d81 100644 --- a/srcpkgs/luafilesystem/template +++ b/srcpkgs/luafilesystem/template @@ -1,7 +1,7 @@ # Template file for 'luafilesystem' pkgname=luafilesystem version=1.6.3 -revision=1 +revision=2 wrksrc="$pkgname-v_${version//./_}" makedepends="lua51-devel" depends="lua51" @@ -18,4 +18,5 @@ do_build() { do_install() { make PREFIX=${DESTDIR}/usr install + vlicense LICENSE } diff --git a/srcpkgs/lugaru-data b/srcpkgs/lugaru-data new file mode 120000 index 00000000000..77538e32dac --- /dev/null +++ b/srcpkgs/lugaru-data @@ -0,0 +1 @@ +lugaru \ No newline at end of file diff --git a/srcpkgs/lugaru/template b/srcpkgs/lugaru/template new file mode 100644 index 00000000000..8bb0b239103 --- /dev/null +++ b/srcpkgs/lugaru/template @@ -0,0 +1,27 @@ +# Template file for 'lugaru' +pkgname=lugaru +version=1.2 +revision=1 +build_style=cmake +configure_args="-DSYSTEM_INSTALL=ON + -DCMAKE_INSTALL_BINDIR=bin + -DCMAKE_INSTALL_DATADIR=share + -DCMAKE_INSTALL_MANDIR=share/man" +hostmakedepends="pkg-config" +makedepends="SDL2-devel zlib-devel libvorbis-devel libopenal-devel libpng-devel libjpeg-turbo-devel glu-devel" +depends="lugaru-data" +short_desc="Third person ninja rabbit fighting game" +maintainer="John " +license="GPL-2" +homepage="https://osslugaru.gitlab.io/" +distfiles="https://bitbucket.org/osslugaru/lugaru/downloads/lugaru-${version}.tar.xz" +checksum=f3ea477caf78911c69939fbdc163f9f6517c7ef2267e716a0e050be1a166ef97 + +lugaru-data_package() { + short_desc+=" - data files" + noarch=yes + license="CC-BY-SA-4" + pkg_install() { + vmove usr/share/lugaru + } +} diff --git a/srcpkgs/lxqt-openssh-askpass/template b/srcpkgs/lxqt-openssh-askpass/template index bab97237448..af7660fda98 100644 --- a/srcpkgs/lxqt-openssh-askpass/template +++ b/srcpkgs/lxqt-openssh-askpass/template @@ -1,7 +1,7 @@ # Template file for 'lxqt-openssh-askpass' pkgname=lxqt-openssh-askpass version=0.11.1 -revision=1 +revision=2 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" hostmakedepends="pkg-config qt5-host-tools liblxqt-devel" @@ -13,3 +13,7 @@ license="LGPL-2.1" homepage="http://lxqt.org/" distfiles="https://github.com/lxde/lxqt-openssh-askpass/releases/download/${version}/lxqt-openssh-askpass-${version}.tar.xz" checksum=52c29549bc1ecaf3e3843e08460f1ec8f1a62bc423a46034b8189fee01803eb9 + +alternatives=" + ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/lxqt-openssh-askpass +" diff --git a/srcpkgs/lyx/INSTALL.msg b/srcpkgs/lyx/INSTALL.msg index 6ad6a9146fc..cc3883d1750 100644 --- a/srcpkgs/lyx/INSTALL.msg +++ b/srcpkgs/lyx/INSTALL.msg @@ -30,4 +30,4 @@ Happy LyXing - The Void Linux mantainers + The Void Linux maintainers diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template index 5d7ed7db19b..ef64121962d 100644 --- a/srcpkgs/mailx/template +++ b/srcpkgs/mailx/template @@ -1,7 +1,7 @@ # Template file for 'mailx' pkgname=mailx version=12.5 -revision=17 +revision=18 patch_args="-Np1" wrksrc="mailx-${version}" makedepends="libressl-devel mit-krb5-devel" @@ -20,6 +20,10 @@ alternatives=" mail:mail.1:/usr/share/man/man1/mailx.1 " +post_install() { + vlicense COPYING +} + do_build() { echo PREFIX=/usr \ BINDIR=/usr/bin \ diff --git a/srcpkgs/mdds/template b/srcpkgs/mdds/template index 1494cead4cf..db02119583e 100644 --- a/srcpkgs/mdds/template +++ b/srcpkgs/mdds/template @@ -1,7 +1,7 @@ # Template file for 'mdds' pkgname=mdds version=1.2.3 -revision=1 +revision=2 _gitrev=08aba857efa2896b202bab09bf0023c714fe6842 wrksrc="${pkgname}-${version}-${_gitrev}" build_style=gnu-configure @@ -14,6 +14,10 @@ distfiles="https://gitlab.com/mdds/mdds/repository/archive.tar.gz?ref=${version} checksum=379b5c2cf2d73db393aedbbdb7326081e32ed7d96746eccb26d9120f9ce5719c noarch=yes +post_install() { + vlicense LICENSE +} + pre_configure() { autoreconf -fi } diff --git a/srcpkgs/mergerfs/template b/srcpkgs/mergerfs/template index d50fb3e5e1d..1796f23acfa 100644 --- a/srcpkgs/mergerfs/template +++ b/srcpkgs/mergerfs/template @@ -1,16 +1,16 @@ # Template file for 'mergerfs' pkgname="mergerfs" -version=2.23.0 +version=2.23.1 revision=1 build_style=gnu-makefile makedepends="fuse-devel attr-devel" hostmakedepends="automake libtool pkg-config" short_desc="FUSE union filesystem" -maintainer="xinterer " +maintainer="Orphaned " license="ISC" homepage="https://github.com/trapexit/mergerfs" distfiles="${homepage}/archive/${version}/${pkgname}-${version}.tar.gz" -checksum=533d9f1725e4801311a712c3c5487c11eabe48dbfe0e48f37291cff5bab17c5b +checksum=f38c3909c7145d291fa4cb85241f488efc01000ec9657a3cf72ee6ab4400c733 case "$XBPS_TARGET_MACHINE" in *-musl) # Does not have pandoc diff --git a/srcpkgs/mg/template b/srcpkgs/mg/template index 0abc8aa9bee..3c1d08bcfde 100644 --- a/srcpkgs/mg/template +++ b/srcpkgs/mg/template @@ -1,6 +1,6 @@ # Template file for 'mg' pkgname=mg -version=20170828 +version=20171014 revision=1 hostmakedepends="pkg-config" makedepends="libbsd-devel ncurses-devel" @@ -9,7 +9,7 @@ short_desc="Micro GNU/emacs" maintainer="Juan RP " license="Public Domain" distfiles="$homepage/mg-$version.tar.gz" -checksum=1f8886ab62e9abfeed7fafbb5ea71685450a34c5d0a243461bd2c5425161368d +checksum=51519698f3f44acd984d7805e4e315ded50c15aba8222521f88756fd67745341 CFLAGS="-DTCSASOFT=0" diff --git a/srcpkgs/minitalk/template b/srcpkgs/minitalk/template new file mode 100644 index 00000000000..48a9af01796 --- /dev/null +++ b/srcpkgs/minitalk/template @@ -0,0 +1,22 @@ +# Template file for 'minitalk' +pkgname=minitalk +version=0.2.4 +revision=1 +build_style=gnu-makefile +make_build_args="LDFLAGS+=-lreadline PREFIX=/usr" +makedepends="readline-devel" +short_desc="A small chat system for multiple users on a UNIX-like host " +maintainer="Andrew Benson " +license="MIT" +homepage="https://github.com/abenson/minitalk" +distfiles="https://github.com/abenson/minitalk/archive/v${version}.tar.gz" +checksum=ef02041efccb60f7bcef36abb20aa4ae00f1edd3b31667ebaa14c5d3b236bb55 + +do_install() { + vbin minitalk + vman minitalk.1 +} + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template index cb570cd6458..395ac07138b 100644 --- a/srcpkgs/mit-krb5/template +++ b/srcpkgs/mit-krb5/template @@ -1,13 +1,13 @@ # Template file for 'mit-krb5' pkgname=mit-krb5 -version=1.15.1 -revision=2 +version=1.15.2 +revision=1 short_desc="MIT Kerberos 5 implementation" maintainer="Juan RP " license="MIT" homepage="http://web.mit.edu/kerberos" distfiles="$homepage/dist/krb5/1.15/krb5-${version}.tar.gz" -checksum=437c8831ddd5fde2a993fef425dedb48468109bb3d3261ef838295045a89eb45 +checksum=1639e392edf25e3b6cfec2ae68f97eb53e07c2dbe74bfeede0108465d5d1c87e build_style=gnu-configure wrksrc="krb5-${version}" diff --git a/srcpkgs/mitlm/template b/srcpkgs/mitlm/template index 12bb98e738c..225c305104f 100644 --- a/srcpkgs/mitlm/template +++ b/srcpkgs/mitlm/template @@ -12,6 +12,10 @@ build_style=gnu-configure configure_args="--disable-static" hostmakedepends="gcc-fortran" +post_install() { + vlicense COPYING +} + libmitlm_package() { short_desc+=" - runtime libraries" pkg_install() { diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template index bc4fffe39eb..582d204f53d 100644 --- a/srcpkgs/mkvtoolnix/template +++ b/srcpkgs/mkvtoolnix/template @@ -1,6 +1,6 @@ # Template file for 'mkvtoolnix' pkgname=mkvtoolnix -version=16.0.0 +version=17.0.0 revision=1 build_style=gnu-configure configure_args="--without-curl --with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt" @@ -12,7 +12,7 @@ maintainer="Jürgen Buchmüller " license="GPL-2" homepage="https://www.bunkus.org/videotools/mkvtoolnix/" distfiles="${homepage}/sources/${pkgname}-${version}.tar.xz" -checksum=5dfb2517003f69f3d8b942751200122c2e4cad2a8675b6fc2dfaad5c98e946e0 +checksum=9faf7996b84eb68c2b1738ec27217d24480731b24d31c81fbef19daa5844992e nocross="Fails due to dependency chain eigen -> jack -> pulseaudio" pre_configure() { diff --git a/srcpkgs/mm-common/template b/srcpkgs/mm-common/template index 19a1381e43f..9e1c024787b 100644 --- a/srcpkgs/mm-common/template +++ b/srcpkgs/mm-common/template @@ -1,7 +1,7 @@ # Template file for 'mm-common' pkgname=mm-common -version=0.9.10 -revision=2 +version=0.9.11 +revision=1 noarch=yes build_style=gnu-configure hostmakedepends="pkg-config intltool itstool" @@ -11,4 +11,4 @@ maintainer="Juan RP " license="LGPL-2" homepage="http://gtkmm.org/" distfiles="http://download.gnome.org/sources/mm-common/${version%.*}/$pkgname-$version.tar.xz" -checksum=16c0e2bc196b67fbc145edaecb5dbe5818386504fe5703de27002d77140fa217 +checksum=20d1e7466ca4c83c92e29f9e8dfcc8e5721fdf1337f53157bed97be3b73b32a8 diff --git a/srcpkgs/libmongoose b/srcpkgs/mongoose-doc similarity index 100% rename from srcpkgs/libmongoose rename to srcpkgs/mongoose-doc diff --git a/srcpkgs/mongoose/patches/add-makefile.patch b/srcpkgs/mongoose/patches/add-makefile.patch new file mode 100644 index 00000000000..26d85cfa8d2 --- /dev/null +++ b/srcpkgs/mongoose/patches/add-makefile.patch @@ -0,0 +1,50 @@ +--- /dev/null ++++ Makefile +@@ -0,0 +1,47 @@ ++PROG = mongoose ++LIB = lib$(PROG).so.0 ++ ++ifndef PREFIX ++ PREFIX=/usr/local ++endif ++ ++ifndef DOCDIR ++ DOCDIR=$(PREFIX)/share/$(PROG)/doc ++endif ++ ++CPPFLAGS+=-DMONGOOSE_ENABLE_THREADS -DMG_ENABLE_SSL ++CFLAGS+=-fPIC -c -Wall ++LDFLAGS+=-shared -lssl -pthread -lcrypto ++ ++SRCS=mongoose.c ++OBJS=mongoose.o ++INCLUDE=. ++ ++all: $(LIB) ++ ++$(LIB): $(OBJS) ++ $(CC) $(OBJS) $(LDFLAGS) -o $(LIB) ++ ++$(OBJS): $(SRCS) ++ $(CC) $(CPPFLAGS) $(CFLAGS) -I$(INCLUDE) $(SRCS) -o $(OBJS) ++ ++install: ++ install -d $(DESTDIR)$(PREFIX)/include ++ install -m644 mongoose.h $(DESTDIR)$(PREFIX)/include ++ install -d $(DESTDIR)$(PREFIX)/lib ++ ln -sf $(LIB) $(LIB).0; cp -a $(LIB).0 $(DESTDIR)$(PREFIX)/lib ++ ln -sf $(LIB) libmongoose.so; cp -a libmongoose.so $(DESTDIR)$(PREFIX)/lib ++ install -m755 $(LIB) $(DESTDIR)$(PREFIX)/lib ++ install -dm755 $(DESTDIR)$(DOCDIR) ++ cp -a examples $(DESTDIR)$(DOCDIR) ++ cp -a docs/* $(DESTDIR)$(DOCDIR)/ ++ ++ ++test: ++ $(MAKE) -C test/ ++clean: ++ rm -f $(OBJS) $(LIB) ++ $(MAKE) -C test/ clean ++ ++.PHONY: clean test all ++ diff --git a/srcpkgs/mongoose/patches/mk-tweaks.patch b/srcpkgs/mongoose/patches/mk-tweaks.patch deleted file mode 100644 index 1a84d9d167b..00000000000 --- a/srcpkgs/mongoose/patches/mk-tweaks.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- Makefile.orig 2013-04-23 09:56:44.031317155 +0200 -+++ Makefile 2013-04-23 10:01:52.126993442 +0200 -@@ -17,7 +17,9 @@ - # -DUSE_LUA - embed Lua in Mongoose (+100kb) - - PROG = mongoose --CFLAGS = -std=c99 -O2 -W -Wall -pedantic -pthread $(COPT) -+LIB = lib$(PROG).so.0 -+CFLAGS += -std=c99 -O2 -W -Wall -pedantic -pthread $(COPT) -+ - - # To build with Lua, download and unzip Lua 5.2.1 source code into the - # mongoose directory, and then add $(LUA_SOURCES) to CFLAGS -@@ -79,7 +81,9 @@ all: - # "-Wl,--as-needed" turned on by default in cc command. - # Also, this is turned in many other distros in static linkage builds. - linux: -- $(CC) mongoose.c main.c -o $(PROG) -ldl $(CFLAGS) -+ $(CC) mongoose.c -shared -fPIC -fpic -Wl,-soname,$(LIB) \ -+ -o $(LIB) -ldl -lpthread $(CFLAGS) -+ $(CC) main.c -o $(PROG) -ldl -lpthread -L. $(LIB) $(CFLAGS) - - mac: bsd - bsd: -@@ -94,6 +98,18 @@ bsd_yassl: - solaris: - $(CC) mongoose.c main.c -lnsl -lsocket -o $(PROG) $(CFLAGS) - -+install: -+ install -d $(DESTDIR)$(PREFIX)/include -+ install -m644 mongoose.h $(DESTDIR)$(PREFIX)/include -+ install -d $(DESTDIR)$(PREFIX)/bin -+ install -m755 $(PROG) $(DESTDIR)$(PREFIX)/bin -+ install -d $(DESTDIR)$(PREFIX)/lib -+ ln -sf $(LIB) $(LIB).0; cp -a $(LIB).0 $(DESTDIR)$(PREFIX)/lib -+ ln -sf $(LIB) libmongoose.so; cp -a libmongoose.so $(DESTDIR)$(PREFIX)/lib -+ install -m755 $(LIB) $(DESTDIR)$(PREFIX)/lib -+ install -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man1 -+ -install -m644 mongoose.1 $(DESTDIR)$(PREFIX)/$(MANDIR)/man1 -+ - # For codesign to work in non-interactive mode, unlock login keychain: - # security unlock ~/Library/Keychains/login.keychain - # See e.g. http://lists.apple.com/archives/apple-cdsa/2008/Jan/msg00027.html diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template index f0c6517091d..a1739aaaccc 100644 --- a/srcpkgs/mongoose/template +++ b/srcpkgs/mongoose/template @@ -1,22 +1,16 @@ # Template file for 'mongoose' pkgname=mongoose -version=3.7 -revision=14 -wrksrc=$pkgname +version=6.9 +revision=1 makedepends="libressl-devel" +build_style=gnu-makefile +make_use_env=compliant short_desc="An Easy to use Web server" maintainer="Juan RP " -license="MIT" -homepage="https://code.google.com/p/mongoose/" -distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mongoose/mongoose-${version}.tgz" -checksum=8376ede0378b6dd80ded78953726e9d3c18a2a8fd1a52a03efe949fd09d2ea68 - -do_build() { - COPT="$CFLAGS $LDFLAGS -DNO_SSL_DL -lcrypto -lssl" make linux -} -do_install() { - make PREFIX=/usr DESTDIR=$DESTDIR install -} +license="GPL-2" +homepage="https://cesanta.com/" +distfiles="https://github.com/cesanta/mongoose/archive/${version}.tar.gz" +checksum=d316b24d4ed23851d81b0ac4e5285b778c684bff27f398b01f779696e5b2711a mongoose-devel_package() { depends="libmongoose>=${version}_${revision}" @@ -27,9 +21,9 @@ mongoose-devel_package() { } } -libmongoose_package() { - short_desc+=" - runtime library" +mongoose-doc_package() { + short_desc+=" - documentation" pkg_install() { - vmove "usr/lib/*.so.*" + vmove usr/share } } diff --git a/srcpkgs/mono-basic/template b/srcpkgs/mono-basic/template new file mode 100644 index 00000000000..6739d70495b --- /dev/null +++ b/srcpkgs/mono-basic/template @@ -0,0 +1,14 @@ +# Template file for 'mono-basic' +pkgname=mono-basic +version=4.6 +revision=1 +build_style=gnu-configure +short_desc="VisualBasic.NET support for mono" +maintainer="Perez " +license="LGPL-2" +homepage="https://www.mono-project.com/" +hostmakedepends="pkg-config mono" +makedepends="mono-devel" +depends="mono" +distfiles="https://download.mono-project.com/sources/${pkgname}/${pkgname}-${version}.tar.bz2" +checksum=303d79f73ae9d6120ef12ebeaf2ec67fda96256801e3bf305c46f8787a751e8f diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template index f2f535f0b46..b8960ea6094 100644 --- a/srcpkgs/mosquitto/template +++ b/srcpkgs/mosquitto/template @@ -1,7 +1,7 @@ # Template file for 'mosquitto' pkgname=mosquitto version=1.4.14 -revision=2 +revision=3 build_style=gnu-makefile make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl make_install_args="prefix=/usr" diff --git a/srcpkgs/mozjs38-devel b/srcpkgs/mozjs38-devel deleted file mode 120000 index 31c380552da..00000000000 --- a/srcpkgs/mozjs38-devel +++ /dev/null @@ -1 +0,0 @@ -mozjs38 \ No newline at end of file diff --git a/srcpkgs/mozjs38/patches/copy-headers.patch b/srcpkgs/mozjs38/patches/copy-headers.patch deleted file mode 100644 index 7f352a795c8..00000000000 --- a/srcpkgs/mozjs38/patches/copy-headers.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Copy headers on install instead of symlinking -Author: Rico Tzschichholz -Forwarded: no -Last-Update: 2014-10-29 - ---- - -Index: b/python/mozbuild/mozbuild/backend/recursivemake.py -=================================================================== ---- a/python/mozbuild/mozbuild/backend/recursivemake.py -+++ b/python/mozbuild/mozbuild/backend/recursivemake.py -@@ -796,7 +796,7 @@ - return - - for source, dest, _ in self._walk_hierarchy(obj, exports): -- self._install_manifests['dist_include'].add_symlink(source, dest) -+ self._install_manifests['dist_include'].add_copy(source, dest) - - if not os.path.exists(source): - raise Exception('File listed in EXPORTS does not exist: %s' % source) diff --git a/srcpkgs/mozjs38/patches/fix-icu-check.patch b/srcpkgs/mozjs38/patches/fix-icu-check.patch deleted file mode 100644 index 873697d18f2..00000000000 --- a/srcpkgs/mozjs38/patches/fix-icu-check.patch +++ /dev/null @@ -1,16 +0,0 @@ -Add bracket for sed 4.3 compliance - -Based on upstream fix by Daniel Stenberg in 09 jan 2017 -See: https://hg.mozilla.org/mozilla-central/rev/ebcbf47a83e7 - ---- a/js/src/configure 2017-02-21 16:56:42.350105741 -0300 -+++ b/js/src/configure 2017-02-21 17:33:13.183493978 -0300 -@@ -15231,7 +15231,7 @@ - fi - fi - -- version=`sed -n 's/^[:space:]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` -+ version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` - if test x"$version" = x; then - { echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&2; echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&5; exit 1; } - fi diff --git a/srcpkgs/mozjs38/patches/gcc-alignment.patch b/srcpkgs/mozjs38/patches/gcc-alignment.patch deleted file mode 100644 index a3a57d54479..00000000000 --- a/srcpkgs/mozjs38/patches/gcc-alignment.patch +++ /dev/null @@ -1,122 +0,0 @@ ---- a/js/src/jit/RegisterSets.h 2017-02-10 17:33:06.210702431 -0800 -+++ b/js/src/jit/RegisterSets.h 2017-02-10 17:43:52.877514146 -0800 -@@ -7,7 +7,6 @@ - #ifndef jit_RegisterSets_h - #define jit_RegisterSets_h - --#include "mozilla/Alignment.h" - #include "mozilla/MathAlgorithms.h" - - #include "jit/JitAllocPolicy.h" -@@ -26,8 +25,8 @@ - Code code_; - - public: -- AnyRegister() -- { } -+ AnyRegister() = default; -+ - explicit AnyRegister(Register gpr) { - code_ = gpr.code(); - } -@@ -156,7 +155,7 @@ - } - #endif - -- ValueOperand() {} -+ ValueOperand() = default; - }; - - // Registers to hold either either a typed or untyped value. -@@ -165,46 +164,25 @@ - // Type of value being stored. - MIRType type_; - -- // Space to hold either an AnyRegister or a ValueOperand. - union U { -- mozilla::AlignedStorage2 typed; -- mozilla::AlignedStorage2 value; -+ AnyRegister typed; -+ ValueOperand value; - } data; - -- AnyRegister& dataTyped() { -- MOZ_ASSERT(hasTyped()); -- return *data.typed.addr(); -- } -- ValueOperand& dataValue() { -- MOZ_ASSERT(hasValue()); -- return *data.value.addr(); -- } -- -- AnyRegister dataTyped() const { -- MOZ_ASSERT(hasTyped()); -- return *data.typed.addr(); -- } -- const ValueOperand& dataValue() const { -- MOZ_ASSERT(hasValue()); -- return *data.value.addr(); -- } -- - public: - -- TypedOrValueRegister() -- : type_(MIRType_None) -- {} -+ TypedOrValueRegister() = default; - - TypedOrValueRegister(MIRType type, AnyRegister reg) - : type_(type) - { -- dataTyped() = reg; -+ data.typed = reg; - } - - MOZ_IMPLICIT TypedOrValueRegister(ValueOperand value) - : type_(MIRType_Value) - { -- dataValue() = value; -+ data.value = value; - } - - MIRType type() const { -@@ -220,11 +198,13 @@ - } - - AnyRegister typedReg() const { -- return dataTyped(); -+ MOZ_ASSERT(hasTyped()); -+ return data.typed; - } - - ValueOperand valueReg() const { -- return dataValue(); -+ MOZ_ASSERT(hasValue()); -+ return data.value; - } - - AnyRegister scratchReg() { -@@ -240,19 +220,18 @@ - // Whether a constant value is being stored. - bool constant_; - -- // Space to hold either a Value or a TypedOrValueRegister. - union U { -- mozilla::AlignedStorage2 constant; -- mozilla::AlignedStorage2 reg; -+ Value constant; -+ TypedOrValueRegister reg; - } data; - - Value& dataValue() { - MOZ_ASSERT(constant()); -- return *data.constant.addr(); -+ return data.constant; - } - TypedOrValueRegister& dataReg() { - MOZ_ASSERT(!constant()); -- return *data.reg.addr(); -+ return data.reg; - } - - public: diff --git a/srcpkgs/mozjs38/patches/js-version.patch b/srcpkgs/mozjs38/patches/js-version.patch deleted file mode 100644 index cc6b3d35b32..00000000000 --- a/srcpkgs/mozjs38/patches/js-version.patch +++ /dev/null @@ -1,65 +0,0 @@ -# HG changeset patch -# Parent 4732a0e5d22bc7e5c1f1ace7a182d537d9cc2c6a -Add major version to shell and js-config filenames. -Author: Rico Tzschichholz -Forwarded: no -Last-Update: 2014-10-29 - ---- -diff --git a/js/src/configure b/js/src/configure ---- a/js/src/configure -+++ b/js/src/configure -@@ -1696,8 +1696,13 @@ - MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"` - IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'` - -+if test -n "$JS_STANDALONE"; then -+JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION -+JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config -+else - JS_SHELL_NAME=js - JS_CONFIG_NAME=js-config -+fi - - - if test -n "$IS_ALPHA"; then - -diff --git a/js/src/configure.in b/js/src/configure.in ---- a/js/src/configure.in -+++ b/js/src/configure.in -@@ -234,16 +234,13 @@ MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSI - MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"` - IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'` - --dnl XXX in a temporary bid to avoid developer anger at renaming files --dnl XXX before "js" symlinks exist, don't change names. --dnl --dnl if test -n "$JS_STANDALONE"; then --dnl JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION --dnl JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config --dnl else -+if test -n "$JS_STANDALONE"; then -+JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION -+JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config -+else - JS_SHELL_NAME=js - JS_CONFIG_NAME=js-config --dnl fi -+fi - - changequote([,]) - if test -n "$IS_ALPHA"; then - -diff -r 80a9e64d75f5 js/src/Makefile.in ---- a/js/src/Makefile.in Wed Jun 25 15:11:42 2014 +0200 -+++ b/js/src/Makefile.in Sat Jul 05 14:08:38 2014 +0200 -@@ -273,6 +273,9 @@ - SCRIPTS = $(JS_CONFIG_NAME) - SDK_BINARY = $(JS_CONFIG_NAME) - -+$(JS_CONFIG_NAME): js-config -+ cp $^ $@ -+ - $(LIBRARY_NAME).pc: js.pc - cp $^ $@ - diff --git a/srcpkgs/mozjs38/patches/pkg-config-version.patch b/srcpkgs/mozjs38/patches/pkg-config-version.patch deleted file mode 100644 index 34a43d1f6df..00000000000 --- a/srcpkgs/mozjs38/patches/pkg-config-version.patch +++ /dev/null @@ -1,22 +0,0 @@ -Add major version to pkg-config filename. -Author: Rico Tzschichholz -Forwarded: no -Last-Update: 2015-05-04 - -Index: b/js/src/Makefile.in -=================================================================== ---- a/js/src/Makefile.in -+++ b/js/src/Makefile.in -@@ -214,10 +214,10 @@ - $(JS_CONFIG_NAME): js-config - cp $^ $@ - --$(LIBRARY_NAME).pc: js.pc -+$(JS_LIBRARY_NAME).pc: js.pc - cp $^ $@ - --install:: $(LIBRARY_NAME).pc -+install:: $(JS_LIBRARY_NAME).pc - $(SYSINSTALL) $^ $(DESTDIR)$(libdir)/pkgconfig - - install:: js-config.h diff --git a/srcpkgs/mozjs38/template b/srcpkgs/mozjs38/template deleted file mode 100644 index 9551d3cc6e4..00000000000 --- a/srcpkgs/mozjs38/template +++ /dev/null @@ -1,47 +0,0 @@ -# Template file for 'mozjs38' -pkgname=mozjs38 -version=38.8.0 -revision=4 -wrksrc="mozilla-esr${version%.*.*}" -build_wrksrc="js/src" -build_style=gnu-configure -hostmakedepends="perl python pkg-config" -makedepends="icu-devel libffi-devel nspr-devel zlib-devel" -short_desc="Mozilla JavaScript interpreter and library (38.x series)" -homepage="http://www.mozilla.org/js/" -license="MPL-1.1, GPL-2, LGPL-2.1" -maintainer="Juan RP " -distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.bz2" -checksum=9475adcee29d590383c4885bc5f958093791d1db4302d694a5d2766698f59982 -patch_args="-Np1" -nopie=yes - -# Flags for gcc6.3 conceived by Arch Linux developers -CFLAGS="-fpermissive -fno-delete-null-pointer-checks -fno-tree-vrp -fno-strict-aliasing" -CXXFLAGS="-fpermissive -fno-delete-null-pointer-checks -fno-tree-vrp -fno-strict-aliasing" -# Use BFD linker to avoid erroneous detection of llvm pr8927 with *-musl -LDFLAGS="-fuse-ld=bfd" - -do_configure() { - local _args - - if [ "$CROSS_BUILD" ]; then - export HOST_CFLAGS="-Os" - export HOST_CXXFLAGS="-Os" - _args+=" --target=$XBPS_CROSS_TRIPLET" - fi - - SHELL=/bin/bash PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --enable-threadsafe --enable-system-ffi --with-system-zlib \ - --with-system-icu --with-system-nspr ${_args} -} - -mozjs38-devel_package() { - depends="nspr-devel ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/bin/js38-config - vmove usr/include - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/mozjs38/update b/srcpkgs/mozjs38/update deleted file mode 100644 index a1c3f7e43b0..00000000000 --- a/srcpkgs/mozjs38/update +++ /dev/null @@ -1 +0,0 @@ -pkgname="mozjs" diff --git a/srcpkgs/mozjs52/template b/srcpkgs/mozjs52/template index 6c9a754b5c2..3b9aa81130d 100644 --- a/srcpkgs/mozjs52/template +++ b/srcpkgs/mozjs52/template @@ -1,7 +1,7 @@ # Template file for 'mozjs52' pkgname=mozjs52 version=52.3.0 -revision=1 +revision=2 wrksrc="firefox-${version}esr" build_wrksrc="js/src" build_style=gnu-configure @@ -52,6 +52,7 @@ mozjs52-devel_package() { vmove usr/bin/js52-config vmove usr/include vmove "usr/lib/*.so" + vmove "usr/lib/*.ajs" vmove usr/lib/pkgconfig } } diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index c64ca7d1a76..2b1e605b22e 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,7 +1,7 @@ # Template file for 'mpd' pkgname=mpd -version=0.20.10 -revision=1 +version=0.20.11 +revision=2 build_style=gnu-configure configure_args="--enable-opus --enable-mikmod --enable-neighbor-plugins --enable-soundcloud --enable-pipe-output --disable-twolame-encoder @@ -27,7 +27,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.musicpd.org/" distfiles="http://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz" -checksum=52fbc1125cdba41ba999add2820d45f3ce7cf493006bb04d8f0b2937204d3121 +checksum=e9227d9daf32a63d6f34bf2ea18b3179b4a383e9d2b49d548702a37451e514bc # Package build options build_options="jack lame mpcdec pulseaudio libao wavpack" diff --git a/srcpkgs/mtdev/template b/srcpkgs/mtdev/template index 39fbf1a329c..6d1ee593683 100644 --- a/srcpkgs/mtdev/template +++ b/srcpkgs/mtdev/template @@ -1,7 +1,7 @@ # Template build file for 'mtdev'. pkgname=mtdev version=1.1.5 -revision=1 +revision=2 build_style=gnu-configure short_desc="Multitouch Protocol Translation Library" maintainer="Juan RP " @@ -10,6 +10,10 @@ license="MIT" distfiles="http://bitmath.org/code/mtdev/mtdev-${version}.tar.bz2" checksum=6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f +post_install() { + vlicense COPYING +} + mtdev-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/mtpaint/update b/srcpkgs/mtpaint/update index 2e97b28e8f4..2c36d36acf3 100644 --- a/srcpkgs/mtpaint/update +++ b/srcpkgs/mtpaint/update @@ -1,2 +1,2 @@ -site=http://sourceforge.net/projects/mtpaint/files/ -pattern='mtpaint/\K[\d]+\.[\d]+' +site=https://github.com/wjaguar/mtPaint/commits/master +pattern='Version \K[\d]+\.[\d]+\.[\d]+' diff --git a/srcpkgs/musl-bootstrap/template b/srcpkgs/musl-bootstrap/template index 61379dd0a19..b429166befe 100644 --- a/srcpkgs/musl-bootstrap/template +++ b/srcpkgs/musl-bootstrap/template @@ -1,6 +1,6 @@ # Template file for 'musl-bootstrap'. pkgname=musl-bootstrap -version=1.1.16 +version=1.1.17 revision=1 lib32disabled=yes wrksrc="musl-${version}" @@ -13,7 +13,7 @@ maintainer="Juan RP " license="MIT" homepage="http://www.musl-libc.org/" distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz" -checksum=937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011 +checksum=c8aa51c747a600704bed169340bf3e03742ceee027ea0051dd4b6cc3c5f51464 post_install() { mv ${DESTDIR}/lib/* ${DESTDIR}/usr/lib/ diff --git a/srcpkgs/musl-rpmatch/template b/srcpkgs/musl-rpmatch/template index d71a30bc5cc..40b62aff87d 100644 --- a/srcpkgs/musl-rpmatch/template +++ b/srcpkgs/musl-rpmatch/template @@ -1,7 +1,7 @@ # Template file for 'musl-rpmatch' pkgname=musl-rpmatch version=1.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-shared --enable-static" hostmakedepends="automake libtool gettext-devel" @@ -19,6 +19,7 @@ pre_configure() { post_install() { vinstall musl-rpmatch.pc 644 usr/lib/pkgconfig + vlicense COPYING } musl-rpmatch-devel_package() { diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template index aa6e7068944..6611319a1ce 100644 --- a/srcpkgs/musl/template +++ b/srcpkgs/musl/template @@ -1,7 +1,7 @@ # Template file for 'musl'. pkgname=musl -version=1.1.16 -revision=2 +version=1.1.17 +revision=1 build_style=gnu-configure configure_args="--prefix=/usr --disable-gcc-wrapper" conflicts="glibc>=0" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="MIT" homepage="http://www.musl-libc.org/" distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz" -checksum=937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011 +checksum=c8aa51c747a600704bed169340bf3e03742ceee027ea0051dd4b6cc3c5f51464 nostrip_files="libc.so" shlib_provides="libc.so" diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index ef230e16a66..6224944abf1 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,6 +1,6 @@ # Template file for 'mutter' pkgname=mutter -version=3.26.0 +version=3.26.1 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static --enable-egl-device" @@ -14,7 +14,7 @@ maintainer="Enno Boland " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=2a62933a11632830c430570b0f8d762fd9f76a2eb955d54cc14f73274d06e577 +checksum=16faf617aae9be06dc5f9e104f4cd20dfdd4d6ec0bc10053752262e9f79a04c2 shlib_provides="libmutter-clutter-1.so libmutter-cogl-path-1.so libmutter-cogl-1.so libmutter-cogl-pango-1.so" nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/1295/steps/shell_3/logs/stdio" CFLAGS+=' -Wno-error=sign-compare -Wno-error=format' diff --git a/srcpkgs/nautilus-CopyAgent b/srcpkgs/nautilus-CopyAgent deleted file mode 120000 index 550c72ab67d..00000000000 --- a/srcpkgs/nautilus-CopyAgent +++ /dev/null @@ -1 +0,0 @@ -CopyAgent \ No newline at end of file diff --git a/srcpkgs/nautilus-sendto/template b/srcpkgs/nautilus-sendto/template index a82f9b38ba5..af6d324751d 100644 --- a/srcpkgs/nautilus-sendto/template +++ b/srcpkgs/nautilus-sendto/template @@ -1,18 +1,17 @@ # Template file for 'nautilus-sendto' pkgname=nautilus-sendto -version=3.8.4 +version=3.8.6 revision=1 -build_style=gnu-configure -configure_args="--disable-schemas-compile" +build_style=meson # XXX: add pidgin and gajim depends for plugins to work. hostmakedepends="pkg-config intltool $(vopt_if gir gobject-introspection)" -makedepends="evolution-data-server-devel nautilus-devel gupnp-devel" +makedepends="evolution-data-server-devel nautilus-devel gupnp-devel appstream-glib-devel" short_desc="Nautilus context menu for sending files" maintainer="Juan RP " homepage="http://download.gnome.org/sources/nautilus-sendto/" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=51065c6e2601560a8bc507c7aee8e967dc6c6f355c6a05a1d4e7e1fe76b908e7 +checksum=164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d build_options="gir" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/neomutt/INSTALL.msg b/srcpkgs/neomutt/INSTALL.msg new file mode 100644 index 00000000000..940935fe5a3 --- /dev/null +++ b/srcpkgs/neomutt/INSTALL.msg @@ -0,0 +1,2 @@ +As of 20171013, neomutt is no longer mutt. System config is in /etc/neomuttrc +Due to upstream's choice, we have removed the alternatives for neomutt files. diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template index aaee45cdec3..e75e255c2ef 100644 --- a/srcpkgs/neomutt/template +++ b/srcpkgs/neomutt/template @@ -1,70 +1,44 @@ # Template file for 'neomutt' pkgname=neomutt -version=20170912 +version=20171013 revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure -configure_args="--enable-pop --enable-imap --enable-smtp --with-gdbm - --enable-gpgme --with-idn --with-ssl --with-sasl --enable-notmuch --enable-lua - --enable-sidebar --enable-nfs-fix --sysconfdir=/etc/$pkgname" -hostmakedepends="automake" +configure_script=./configure.autosetup +configure_args="--ssl --gpgme --notmuch --gdbm --lua --sasl" +hostmakedepends="libxslt docbook-xsl w3m tcl" makedepends="ncurses-devel gpgme-devel libidn-devel libressl-devel libsasl-devel gdbm-devel aspell-devel libnotmuch-devel gettext-devel lua-devel" depends="mime-types" -conf_files="/etc/$pkgname/Muttrc" +conf_files="/etc/neomuttrc" short_desc="Mutt with misc fixes and feature patches" -maintainer="Toyam Cox " +maintainer="Toyam Cox " license="GPL-2" homepage="http://www.neomutt.org" distfiles="https://github.com/neomutt/neomutt/archive/neomutt-${version}.tar.gz" -checksum=9f0d128fe8dbbbddb67e2b629f8b5e52a9d892f82c735845c1708c14e3046657 +checksum=5a7c6302d623b620db03d923a7cd7cf967123a67fc42c117a0dd4b45612e9a55 +nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/5375 no longer gnu-configure, but needs /etc set correctly and also to know how to cross build documentation" + +# fix: +if [ -n "${XBPS_CROSS_BASE}" ]; then + configure_args="${configure_args} --host=$XBPS_CROSS_TRIPLET" + configure_args="${configure_args} --build=$XBPS_TRIPLET" + configure_args="${configure_args} --with-lua=$XBPS_CROSS_BASE/" + configure_args="${configure_args} --with-ncurses=$XBPS_CROSS_BASE/" + configure_args="${configure_args} --with-notmuch=$XBPS_CROSS_BASE/" + configure_args="${configure_args} --with-ssl=$XBPS_CROSS_BASE/" + configure_args="${configure_args} --with-gdbm=$XBPS_CROSS_BASE/" + configure_args="${configure_args} --with-gpgme=$XBPS_CROSS_BASE/" +fi case "${XBPS_TARGET_MACHINE}" in x86_64-musl) CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1";; # Inquiry: Do we have largefile support on everywhere? esac -provides="mutt-0_1" -# Begin alternatives: -alternatives=" - mutt:mutt:/usr/bin/mutt-$pkgname - mutt:pgpewrap:/usr/bin/pgpewrap-$pkgname - mutt:flea:/usr/bin/flea-$pkgname - mutt:muttbug:/usr/bin/muttbug-$pkgname - mutt:smime_keys:/usr/bin/smime_keys-$pkgname - - mutt:pgpewrap.1:/usr/share/man/man1/pgpewrap-${pkgname}.1 - mutt:flea.1:/usr/share/man/man1/flea-${pkgname}.1 - mutt:mutt.1:/usr/share/man/man1/mutt-${pkgname}.1 - mutt:pgpring.1:/usr/share/man/man1/pgpring-${pkgname}.1 - mutt:muttbug.1:/usr/share/man/man1/muttbug-${pkgname}.1 - mutt:smime_keys.1:/usr/share/man/man1/smime_keys-${pkgname}.1 - - mutt:mbox.5:/usr/share/man/man5/mbox-${pkgname}.5 - mutt:muttrc.5:/usr/share/man/man5/muttrc-${pkgname}.5 - mutt:mmdf.5:/usr/share/man/man5/mmdf-${pkgname}.5 -" -# End alternatives - -pre_configure() { - autoreconf -fi -} - post_install() { - # provided by mime-types - rm "${DESTDIR}"/etc/${pkgname}/mime.* - ln -s /etc/mime.types "${DESTDIR}/etc/${pkgname}/mime.types" # move dist to examples dir vsconf contrib/gpg.rc Muttrc.gpg.dist - mv "${DESTDIR}/etc/$pkgname/Muttrc.dist" "${DESTDIR}/usr/share/examples/${pkgname}" - - # Allows alternatives to work - for manpage in "${DESTDIR}"/usr/share/man/man[15]/*; do - mv "$manpage" "${manpage%.*}-${pkgname}.${manpage##*.}" - done - for binary in "${DESTDIR}"/usr/bin/*; do - mv "$binary" "${binary}-${pkgname}" - done } # REMARKS: @@ -77,3 +51,7 @@ post_install() { # In version 20160808 keybase integration was added, and lots of new # documentation now gets installed. Rumors of an /etc/NeoMuttrc are in the # release notes but not currently installed for unknown reasons. +# As of 20171013, neomutt has hard forked and no longer refers to itself as +# "Mutt" anywhere in the codebase. https://www.neomutt.org/2017/10/13/release +# /etc/neomuttrc now exists, and there are no conflicts with regular mutt. +# Due to this, an install.msg was added and all alternatives were removed. diff --git a/srcpkgs/neovim-remote/template b/srcpkgs/neovim-remote/template new file mode 100644 index 00000000000..3b472046345 --- /dev/null +++ b/srcpkgs/neovim-remote/template @@ -0,0 +1,19 @@ +# Template file for 'neovim-remote' +pkgname=neovim-remote +version=1.8.5 +revision=1 +noarch=yes +build_style=python3-module +pycompile_module="nvr" +hostmakedepends="python3-setuptools" +depends="python3-neovim python3-psutil" +short_desc="Control nvim processes using 'nvr' commandline tool" +maintainer="dleeram " +license="MIT" +homepage="https://github.com/mhinz/neovim-remote" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=6c5c5a100785b06becceb2dfda66f22685307d9d5e8dd0b6d89252630fe63e2d + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/nnn/patches/0001-make-sys-types_h-global.patch b/srcpkgs/nnn/patches/0001-make-sys-types_h-global.patch new file mode 100644 index 00000000000..5ef75911902 --- /dev/null +++ b/srcpkgs/nnn/patches/0001-make-sys-types_h-global.patch @@ -0,0 +1,18 @@ +--- nnn.c ++++ nnn.c +@@ -28,7 +28,6 @@ + #include + #include + #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) +-# include + #include + #include + #define BSD_KQUEUE +@@ -69,6 +68,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/srcpkgs/nnn/template b/srcpkgs/nnn/template index d56151e5c07..75648517c14 100644 --- a/srcpkgs/nnn/template +++ b/srcpkgs/nnn/template @@ -1,15 +1,16 @@ # Template file for 'nnn' pkgname=nnn -version=1.4 +version=1.5 revision=1 build_style=gnu-makefile +hostmakedepends="pkg-config" makedepends="ncurses-devel readline-devel" short_desc="A lightweight terminal file browser" maintainer="Dennis Kraus " license="BSD" homepage="https://github.com/jarun/nnn" distfiles="https://github.com/jarun/nnn/archive/v${version}.tar.gz" -checksum=f1170864c26e55d89034d555572484950998fa6d99784237d76cd4e3bf45aed8 +checksum=f50f59953c29408963bbb961891155bd0a1fe2072d4441cc0ff927b128725c7f post_install() { vlicense LICENSE diff --git a/srcpkgs/node_exporter/files/node_exporter/run b/srcpkgs/node_exporter/files/node_exporter/run index 3ec9cffccb2..7bb3278b611 100755 --- a/srcpkgs/node_exporter/files/node_exporter/run +++ b/srcpkgs/node_exporter/files/node_exporter/run @@ -7,4 +7,4 @@ : ${RUNIT_COLLECTOR:='--collector.runit --collector.runit.servicedir /var/service'} [ -n "$LISTEN_ADDR" ] && LISTEN_ADDR="--web.listen-address ${LISTEN_ADDR}" -exec chpst -u $USER node_exporter -collectors.enabled ${RUNIT_COLLECTOR} ${LISTEN_ADDR} ${ARGS} +exec chpst -u $USER node_exporter ${RUNIT_COLLECTOR} ${LISTEN_ADDR} ${ARGS} diff --git a/srcpkgs/node_exporter/template b/srcpkgs/node_exporter/template index d51251c6e00..e95bd4d0ba6 100644 --- a/srcpkgs/node_exporter/template +++ b/srcpkgs/node_exporter/template @@ -1,7 +1,7 @@ # Template file for 'node_exporter' pkgname=node_exporter version=0.15.0 -revision=1 +revision=2 build_style=go go_import_path="github.com/prometheus/node_exporter" go_ldflags="-X ${go_import_path}/version.Version=${version} diff --git a/srcpkgs/npapi-sdk/template b/srcpkgs/npapi-sdk/template new file mode 100644 index 00000000000..384b6efe0d5 --- /dev/null +++ b/srcpkgs/npapi-sdk/template @@ -0,0 +1,11 @@ +# Template file for 'npapi-sdk' +pkgname=npapi-sdk +version=0.27.2 +revision=1 +build_style=gnu-configure +short_desc="Netscape Plugin API (NPAPI)" +maintainer="oliver JH " +license="MPL-1.1,GPL-2,LGPL-2.1" +homepage="https://bitbucket.org/mgorny/npapi-sdk" +distfiles="https://bitbucket.org/mgorny/$pkgname/downloads/$pkgname-$version.tar.bz2" +checksum=01bf34bdd0fcaa546ba3d5c96f5d91f91dd117d4ed5ffe13f56bbd5aa566ae77 diff --git a/srcpkgs/npapi-sdk/update b/srcpkgs/npapi-sdk/update new file mode 100644 index 00000000000..8e9bca39e39 --- /dev/null +++ b/srcpkgs/npapi-sdk/update @@ -0,0 +1,2 @@ +site='https://bitbucket.org/mgorny/npapi-sdk/downloads/?tab=tags' +pattern='/get/npapi-sdk-\K[\d.]+(?=\.tar\.bz2)' diff --git a/srcpkgs/numix-themes/template b/srcpkgs/numix-themes/template index d8ae851c1da..942bead6878 100644 --- a/srcpkgs/numix-themes/template +++ b/srcpkgs/numix-themes/template @@ -1,24 +1,22 @@ pkgname=numix-themes version=2.6.6 -revision=2 +revision=1 +wrksrc="numix-gtk-theme-${version}" noarch=yes -wrksrc=numix-gtk-theme-${version} -short_desc="A modern flat GTK3/Metacity/Xfwm theme" +build_style=gnu-makefile +short_desc="A modern flat theme with a combination of light and dark elements" maintainer="Jakub Skrzypnik " license="GPL-3" depends="gtk+3 gtk-engine-murrine" -hostmakedepends="glib-devel ruby libxml2 gdk-pixbuf" +hostmakedepends="glib-devel gdk-pixbuf-devel ruby-devel" homepage="https://github.com/numixproject/numix-gtk-theme" distfiles="${homepage}/archive/${version}.tar.gz" checksum=5ee5ed54bea10fe23c99f1fcc614cbf593764b6310cdf889723f8c251abf0856 -do_build() { - # Gem needs --pre for the ruby version in the repos. - gem install sass --pre - make ${makejobs} +pre_build() { + gem install sass } -do_install() { - vmkdir usr/share/themes/numix-gtk-theme - vcopy src/* usr/share/themes/numix-gtk-theme +post_install() { + vlicense LICENSE } diff --git a/srcpkgs/obmenu-generator/template b/srcpkgs/obmenu-generator/template index a595a691fa5..a37899de7ae 100644 --- a/srcpkgs/obmenu-generator/template +++ b/srcpkgs/obmenu-generator/template @@ -1,15 +1,15 @@ # Template file for 'obmenu-generator' pkgname=obmenu-generator -version=0.80 +version=0.81 revision=1 noarch=yes maintainer="Juan RP " homepage="http://trizenx.blogspot.ro/2012/02/obmenu-generator.html" license="GPL-3" short_desc="Perl Script to generate Openbox menu" -depends="perl>=5.20 perl-Linux-DesktopFiles perl-Data-Dump" +depends="perl>=5.20 perl-Linux-DesktopFiles perl-Data-Dump perl-Gtk2" distfiles="https://github.com/trizen/${pkgname}/archive/${version}.tar.gz" -checksum=7091f1cbf73495cc186af3dd92a85846c1e44c6ec97dad6ae523ce108eb29914 +checksum=3104276db632f9cec9f65fc31dec498ec2a78699809e5e96e89a00f546005f22 do_install() { vbin obmenu-generator diff --git a/srcpkgs/offlineimap/template b/srcpkgs/offlineimap/template index 2a3a22bdb7b..b653e2bc734 100644 --- a/srcpkgs/offlineimap/template +++ b/srcpkgs/offlineimap/template @@ -1,6 +1,6 @@ # Template file for 'offlineimap' pkgname=offlineimap -version=7.1.2 +version=7.1.3 revision=1 noarch=yes build_style=python2-module @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="http://offlineimap.org/" license="GPL-2" distfiles="https://github.com/OfflineIMAP/offlineimap/archive/v${version}.tar.gz" -checksum=7203435e34f73e90d1833b72c49a859decf7b5828384a2648ee4b2d1ef3bdc66 +checksum=02fc106904ddeb3fb64b3e17d3838ed2223e5ade0018900751b1ba8111b45f45 post_install() { make -C docs man diff --git a/srcpkgs/ogmrip/patches/tesseract.patch b/srcpkgs/ogmrip/patches/tesseract.patch new file mode 100644 index 00000000000..228679bfa0b --- /dev/null +++ b/srcpkgs/ogmrip/patches/tesseract.patch @@ -0,0 +1,20 @@ +--- libogmrip/ogmrip-srt.c.orig 2015-01-10 14:39:43.000000000 +0100 ++++ libogmrip/ogmrip-srt.c 2017-10-16 21:00:19.921665865 +0200 +@@ -228,7 +228,7 @@ + g_return_val_if_fail (input != NULL, NULL); + + argv = g_ptr_array_new (); +- g_ptr_array_add (argv, g_strdup ("tesseract")); ++ g_ptr_array_add (argv, g_strdup ("tesseract-ocr")); + g_ptr_array_add (argv, g_strdup (input)); + g_ptr_array_add (argv, g_strdup (input)); + +@@ -555,7 +555,7 @@ + } + + #ifdef HAVE_TESSERACT_SUPPORT +- fullname = g_find_program_in_path ("tesseract"); ++ fullname = g_find_program_in_path ("tesseract-ocr"); + use_tesseract = fullname != NULL; + g_free (fullname); + diff --git a/srcpkgs/ogmrip/template b/srcpkgs/ogmrip/template index 7844e6f624e..4deab88d3a9 100644 --- a/srcpkgs/ogmrip/template +++ b/srcpkgs/ogmrip/template @@ -1,8 +1,8 @@ # Template file for 'ogmrip' pkgname=ogmrip version=1.0.1 -revision=1 -short_desc="Application and ripping and encoding DVD into AVI, OGM, MP4, or Matroska" +revision=2 +short_desc="Application to rip and encode DVDs into AVI, OGM, MP4, or Matroska" maintainer="Martin Riese " license="LGPL-2.1" homepage="http://ogmrip.sourceforge.net/en/index.html" diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template index 159f98db896..9a6e6c10b51 100644 --- a/srcpkgs/okular/template +++ b/srcpkgs/okular/template @@ -1,21 +1,17 @@ # Template file for 'okular' pkgname=okular -version=4.14.3 -revision=3 +version=17.08.1 +revision=1 build_style=cmake -configure_args="-Wno-dev -DKDE4_BUILD_TESTS=OFF -DWITH_ActiveApp=OFF" -hostmakedepends="automoc4 pkg-config" -makedepends="glib-devel libressl-devel qt-devel phonon-devel kdelibs-devel - kde-runtime-devel qimageblitz-devel libchmlib-devel djvulibre-devel libspectre-devel - libkexiv2-devel poppler-qt4-devel qca-devel kactivities-devel freetype-devel - ebook-tools-devel" -depends="hicolor-icon-theme" +hostmakedepends="extra-cmake-modules pkg-config" +makedepends="djvulibre-devel khtml-devel kjs-devel kparts-devel kpty-devel libchmlib-devel libspectre-devel plasma-framework-devel poppler-qt5-devel qca-qt5-devel qt5-speech-devel threadweaver-devel" +depends="hicolor-icon-theme oxygen-icons" short_desc="KDE Document Viewer" maintainer="Juan RP " -license="GPL, LGPL, FDL" +license="GPL-2" homepage="http://kde.org/applications/graphics/okular/" -distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=e6e2125f3ea5d3d5295dfac658814e6c424af710ec330cc74192863977385c46 +distfiles="https://download.kde.org/stable/applications/${version}/src/${pkgname}-${version}.tar.xz" +checksum=8625462d8426ad903500fe1d6821a65776715932f5746f2a46e911c59cd3f108 libokular_package() { short_desc+=" - runtime library" diff --git a/srcpkgs/openmw-cs b/srcpkgs/openmw-cs new file mode 120000 index 00000000000..b54e95dedd1 --- /dev/null +++ b/srcpkgs/openmw-cs @@ -0,0 +1 @@ +openmw \ No newline at end of file diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template index fa197c97994..8dbcd2371bd 100644 --- a/srcpkgs/openmw/template +++ b/srcpkgs/openmw/template @@ -1,20 +1,46 @@ # Template file for 'openmw' pkgname=openmw -version=0.41.0 +version=0.42.0 revision=3 wrksrc="${pkgname}-${pkgname}-${version}" build_style=cmake +configure_args="-DDESIRED_QT_VERSION=5" hostmakedepends="pkg-config" -makedepends="libXt-devel libunshield-devel libmygui-devel osg-devel\ - bullet-devel libopenal-devel SDL2-devel qt-devel boost-devel\ - ffmpeg-devel libavformat libavutil libswscale libswresample" -short_desc="Open Implementation of Morrowninds Engine" +makedepends="libXt-devel libunshield-devel libmygui-devel osg-devel + bullet-devel libopenal-devel SDL2-devel qt5-devel boost-devel + ffmpeg-devel libavformat libavutil libswscale libswresample" +short_desc="Open Implementation of Morrowind's Engine" maintainer="JohnZ " license="GPL-3" homepage="http://openmw.org" distfiles="https://github.com/OpenMW/${pkgname}/archive/${pkgname}-${version}.tar.gz" -checksum=a3e1c7d060dc461b9b63ceb5d9ec56b90c1bdcbfd37f0c7c7310c38ec7e3e21d +checksum=fcbcc332ae65d03fae38ccab589b110e18a450182ace541f436f5d6a02408ade case "${XBPS_TARGET_MACHINE}" in aarch* | mips* | arm*) broken="https://bugs.openmw.org/issues/564" ;; esac + +openmw-cs_package() { + short_desc="Open Implementation of Moeeowinds Creation Set" + depends="openmw-${version}_${revision}" + pkg_install() { + vmove usr/bin/openmw-cs + vmove usr/share/applications/openmw-cs.desktop + vmove usr/share/pixmaps/openmw-cs.png + vmove etc/openmw/openmw-cs.cfg + } +} + +esmtool_package() { + short_desc="Tool for inspecting and extracting Morrowind's ES files" + pkg_install() { + vmove usr/bin/esmtool + } +} + +bsatool_package() { + short_desc="Tool for inspecting Bethesda's BSA archives" + pkg_install() { + vmove usr/bin/bsatool + } +} diff --git a/srcpkgs/openra/template b/srcpkgs/openra/template new file mode 100644 index 00000000000..b726b59fbd9 --- /dev/null +++ b/srcpkgs/openra/template @@ -0,0 +1,29 @@ +# Template file for 'openra' +pkgname=openra +version=20171014 +revision=1 +wrksrc="OpenRA-release-${version}" +noarch=yes +hostmakedepends="mono unzip curl" +makedepends="SDL2-devel lua51-devel freetype-devel libopenal-devel libgdiplus-devel" +depends="mono libopenal freetype xdg-utils zenity SDL2 lua51 libgdiplus" +build_style="gnu-makefile" +make_install_target="install install-linux-shortcuts install-linux-mime + install-linux-appdata install-man-page" +make_install_args="prefix=/usr" +homepage="http://www.openra.net" +short_desc="An open-source implementation of the Red Alert engine" +maintainer="Helmut Pozimski " +license="GPL-3" +distfiles="https://github.com/OpenRA/OpenRA/archive/release-${version}.tar.gz" +checksum=ea8a6c38f22c3432bd173c15e3f3d96a7bb47c39f73db5aa5ab6df7e6980ed5a + + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" lua51 libgdiplus" +fi + +pre_build() { + make VERSION="release-${version}" version + make dependencies +} diff --git a/srcpkgs/openra/update b/srcpkgs/openra/update new file mode 100644 index 00000000000..2fa786087cb --- /dev/null +++ b/srcpkgs/openra/update @@ -0,0 +1,2 @@ +site=http://www.openra.net/download/ +pattern='release-[0-9]{8}' diff --git a/srcpkgs/openshot/template b/srcpkgs/openshot/template index 83344c85f37..5b2371b8e6c 100644 --- a/srcpkgs/openshot/template +++ b/srcpkgs/openshot/template @@ -1,7 +1,7 @@ # Template file for 'openshot' pkgname=openshot -version=2.3.4 -revision=2 +version=2.4.0 +revision=1 wrksrc="${pkgname}-qt-${version}" build_style=python3-module only_for_archs="i686 x86_64" @@ -15,4 +15,4 @@ maintainer="Spencer Hill " license="GPL-3" homepage="www.openshot.org" distfiles="https://github.com/OpenShot/openshot-qt/archive/v${version}.tar.gz" -checksum=8e120df0a3165d183d1452402eceb3cf66ce7bc721a5e0991dd5b008aeed0efa +checksum=a4fed9815ffb4f93cd85a79a86bb78e157086b596599c2bb68368ef53ebf8e17 diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template index 496e53ac2a1..cefd08206ac 100644 --- a/srcpkgs/opera/template +++ b/srcpkgs/opera/template @@ -1,6 +1,6 @@ # Template file for 'opera' pkgname=opera -version=47.0.2631.39 +version=48.0.2685.32 revision=1 only_for_archs="x86_64" hostmakedepends="freetype-devel" @@ -12,7 +12,7 @@ repository="nonfree" homepage="https://www.opera.com/computer" nopie=yes distfiles="https://get.geo.opera.com/pub/${pkgname}/desktop/${version}/linux/${pkgname}-stable_${version}_amd64.deb" -checksum=9a719476fc632656b56511f4b51b64707b2b7478268c1824214db0b08b74fef9 +checksum=681fc21800bcdea3fefb5f00f2fc5c0817040e1ec5028b59152d7610b2671780 do_extract() { ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-stable_${version}_amd64.deb diff --git a/srcpkgs/oracle-jdk/template b/srcpkgs/oracle-jdk/template index 7a97023f16d..6a760cb063d 100644 --- a/srcpkgs/oracle-jdk/template +++ b/srcpkgs/oracle-jdk/template @@ -1,11 +1,11 @@ # Template file for 'oracle-jdk' pkgname=oracle-jdk -version=8u144 +version=8u152 revision=1 -_build=01 +_build=16 _longVersion=1.${version%u*}.0_${version#*u} -_tag=090f390dda5b47b9b721c7dfaa008135 +_tag=aa0333dd3019491ca4f6ddbe78cdb6d0 short_desc="Java Development Kit (JDK)" maintainer="Enno Boland " @@ -23,22 +23,22 @@ case "${XBPS_TARGET_MACHINE}" in x86_64) _arch=amd64 _filename=jdk-${version}-linux-x64.tar.gz - checksum=e8a341ce566f32c3d06f6d0f0eeea9a0f434f538d22af949ae58bc86f2eeaae4 + checksum=218b3b340c3f6d05d940b817d0270dfe0cfd657a636bad074dcabe0c111961bf ;; i686) _arch=i386 _filename=jdk-${version}-linux-i586.tar.gz - checksum=624c090647629394ef0ee08d9d8ac5d3d5a9a60fa245fefb2eb417c36c7cb7c4 + checksum=fc60b121d4b194fa70084fd0ca0d69e8b78e5db01a071efe200e90eed83c4c3e ;; arm*) _arch=arm _filename=jdk-${version}-linux-arm32-vfp-hflt.tar.gz - checksum=cbbd390e19ab4c473e05f60602ce2804db25e4e35be5ab95f4f1a2aeb5b72383 + checksum=35ab532355c72310c4c7add2b7c7f9d1eb0e045cf59d3fd69ee08fa6a9e610f0 ;; aarch64) _arch=aarch64 _filename=jdk-${version}-linux-arm64-vfp-hflt.tar.gz - checksum=bbcf4a0805f9bcead32fd988b74cee61ef6ad90e6d1b4e0dce432ac3fd8e0168 + checksum=732609dd090a7d20e09b48b90f8f447497879bb6da1b786a9dd1ea6e91ea178f ;; esac diff --git a/srcpkgs/oracle-jre/template b/srcpkgs/oracle-jre/template index bf351d92fda..252ad12dfa5 100644 --- a/srcpkgs/oracle-jre/template +++ b/srcpkgs/oracle-jre/template @@ -1,11 +1,11 @@ # Template file for 'oracle-jre' pkgname=oracle-jre -version=8u144 +version=8u152 revision=1 _longVersion=1.${version%u*}.0_${version#*u} -_build=01 -_tag=090f390dda5b47b9b721c7dfaa008135 +_build=16 +_tag=aa0333dd3019491ca4f6ddbe78cdb6d0 short_desc="Java Runtime Environment (JRE)" maintainer="Enno Boland " @@ -22,12 +22,12 @@ case "${XBPS_TARGET_MACHINE}" in x86_64) _arch=amd64 _filename=jre-${version}-linux-x64.tar.gz - checksum=4e6e11aad54ae3c716a5607ee88d81f3f1e8b5b23ee474b0272dba351ee9f28a + checksum=ed04ffbf8050a69b15f02c51a2cae8e0de9362e7f6fe8995b1c39c613fc20ede ;; i686) _arch=i386 _filename=jre-${version}-linux-i586.tar.gz - checksum=9ac5b0d6cda9279a4959a6eb635d849d745a37dafc24666539d1c8f7d76ab77a + checksum=1d0c9202fbed3136d46674547b92d467e28b6256dce5d1793c55c284c285a14d ;; esac diff --git a/srcpkgs/orientdb/template b/srcpkgs/orientdb/template index 630f16cadd0..bf23b54c4bf 100644 --- a/srcpkgs/orientdb/template +++ b/srcpkgs/orientdb/template @@ -1,6 +1,6 @@ # Template file for 'orientdb' pkgname=orientdb -version=2.2.28 +version=2.2.29 revision=1 only_for_archs="i686 x86_64" conf_files="/etc/orientdb/hazelcast.xml" @@ -12,7 +12,7 @@ license="Apache-2.0" patch_args="-p1" homepage="http://orientdb.com" distfiles="http://www.orientdb.com/download.php?email=unknown@unknown.com&file=orientdb-community-${version}.tar.gz&os=linux>orientdb-community-${version}.tar.gz" -checksum=e9792d13246f19dbe5d5712dab974f378cb01e527f28617dcdb90cda443a49d7 +checksum=0e4f5d5150afcfb509dcafd6dced587d70f521dab4e27980e30c76c69be78ea9 system_accounts="orientdb" conf_files="/etc/${pkgname}/*" diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template index 9b7885df4a2..c546f85e264 100644 --- a/srcpkgs/p11-kit/template +++ b/srcpkgs/p11-kit/template @@ -1,6 +1,6 @@ # Template file for 'p11-kit' pkgname=p11-kit -version=0.23.8 +version=0.23.9 revision=1 build_style=gnu-configure configure_args="--with-module-path=/usr/lib/pkcs11 --without-trust-paths" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="3-clause-BSD" homepage="https://github.com/p11-glue/p11-kit" distfiles="${homepage}/releases/download/${version}/p11-kit-${version}.tar.gz" -checksum=4ba134e5fe4b62bcaf7a2d66841767d9d23e875b977bba6939367a9f400b133f +checksum=e1c1649c335107a8d33cf3762eb7f57b2d0681f0c7d8353627293a58d6b4db63 post_install() { mv ${DESTDIR}/etc/pkcs11/pkcs11.conf.example ${DESTDIR}/etc/pkcs11/pkcs11.conf diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template index 397d27b2bea..6858a6435d2 100644 --- a/srcpkgs/packer/template +++ b/srcpkgs/packer/template @@ -1,6 +1,6 @@ # Template file for 'packer' pkgname=packer -version=1.1.0 +version=1.1.1 revision=1 replaces="packer-bin>=0" short_desc="Create identical multiplatform machine images from a single source" @@ -11,7 +11,7 @@ license="MPL-2" homepage="http://www.packer.io" go_import_path="github.com/mitchellh/packer" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=01a6b3e3047f0119c6d6f890d44a1e656fb0fcceb26de67e6ba00a40b7aeca99 +checksum=5c3eb3ee17e10c7fcb9c0bef6d325a98ca341d6af6bb13d698984ae44316cba2 post_build() { for F in $(find -type f -name main.go); do diff --git a/srcpkgs/pam_rundir/template b/srcpkgs/pam_rundir/template new file mode 100644 index 00000000000..34149cb55f9 --- /dev/null +++ b/srcpkgs/pam_rundir/template @@ -0,0 +1,17 @@ +# Template file for 'pam_rundir-1.0.0' +pkgname=pam_rundir +version=1.0.0 +revision=1 +build_style=configure +configure_args="--prefix=/usr --with-parentdir=/run/user" +makedepends="pam-devel" +short_desc="PAM Module to create and remove user runtime directories" +maintainer="maxice8 " +license="GPL-2" +homepage="https://jjacky.com/pam_rundir" +distfiles="https://jjacky.com/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=c779b699ed23777a3bdba87b7f67ed395fe957f3c96138faee45f87a27bcc020 + +post_install() { + vlicense COPYING LICENSE +} diff --git a/srcpkgs/pan/template b/srcpkgs/pan/template new file mode 100644 index 00000000000..c3fb52fe873 --- /dev/null +++ b/srcpkgs/pan/template @@ -0,0 +1,24 @@ +# Template build file for 'pan' +pkgname=pan +version=0.142 +revision=1 +build_style=gnu-configure +configure_args="--with-gnutls" +hostmakedepends="automake pkg-config yelp-tools glib-devel gettext-devel" +makedepends="gmime-devel gnutls-devel gtk+-devel" +depends="desktop-file-utils" +maintainer="cr6git " +short_desc="Powerful and user-friendly Usenet newsreader for GTK+" +homepage="http://pan.rebelbase.com" +license="GPL-2" +distfiles="https://github.com/GNOME/pan2/archive/PAN_${version/./_}.tar.gz" +checksum=93322e907ab6c39bde76c6a31dfc7c5a0d0f9977ffd6e0b1eb6a7c0502ef7e05 +wrksrc="pan2-PAN_${version/./_}" + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" gtk+-devel" +fi + +pre_configure() { + NOCONFIGURE=1 ./autogen.sh +} diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template new file mode 100644 index 00000000000..842cf5b2020 --- /dev/null +++ b/srcpkgs/perl-CGI/template @@ -0,0 +1,16 @@ +# Template build file for 'perl-CGI'. +pkgname=perl-CGI +version=4.36 +revision=1 +noarch=yes +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="${hostmakedepends}" +depends="${hostmakedepends}" +short_desc="Handle Common Gateway Interface requests and responses" +maintainer="newbluemoon " +homepage="http://search.cpan.org/dist/CGI/" +license="Artistic-2.0, GPL-1" +distfiles="${CPAN_SITE}/CGI/${pkgname/perl-/}-$version.tar.gz" +checksum=fefe84d4f2461e867f9be80f3f988e17bcbbcb4e306952cf2fd1dea7e4515490 diff --git a/srcpkgs/perl-DBD-Pg/template b/srcpkgs/perl-DBD-Pg/template index 83f1a600135..80e5c8b8d85 100644 --- a/srcpkgs/perl-DBD-Pg/template +++ b/srcpkgs/perl-DBD-Pg/template @@ -1,7 +1,7 @@ # Template build file for 'perl-DBD-Pg'. pkgname=perl-DBD-Pg -version=3.5.3 -revision=3 +version=3.7.0 +revision=1 wrksrc="DBD-Pg-${version}" build_style=perl-module hostmakedepends="perl perl-DBI" @@ -12,5 +12,5 @@ maintainer="John Regan " homepage="http://search.cpan.org/dist/DBD-Pg" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/DBD/DBD-Pg-$version.tar.gz" -checksum=7e98a9b975256a4733db1c0e974cad5ad5cb821489323e395ed97bd058e0a90e +checksum=e36e0459c9cf0f12edafb74f4cef685876d0460dbe6b411e7109070c67e56459 nocross="yes" diff --git a/srcpkgs/perl-Linux-DesktopFiles/template b/srcpkgs/perl-Linux-DesktopFiles/template index 1db23de7870..c94629dcd87 100644 --- a/srcpkgs/perl-Linux-DesktopFiles/template +++ b/srcpkgs/perl-Linux-DesktopFiles/template @@ -1,6 +1,6 @@ # Template file for 'perl-Linux-DesktopFiles'. pkgname=perl-Linux-DesktopFiles -version=0.12 +version=0.21 revision=1 wrksrc="${pkgname#perl-}-${version}" build_style=perl-module @@ -13,4 +13,4 @@ maintainer="Juan RP " homepage="https://metacpan.org/pod/Linux::DesktopFiles" license="Artistic, GPL-1" distfiles="https://cpan.metacpan.org/authors/id/T/TR/TRIZEN/Linux-DesktopFiles-${version}.tar.gz" -checksum=8140bd3324fc13361ee8f4cdaa2a9c41727773e80deb02aa9cd435c928f3fb50 +checksum=3479eb6b2abbb7d3cc95fa8b17d011e5bfbda2c68a8d7fd9e2b5d0a6c3438a8c diff --git a/srcpkgs/perl-List-MoreUtils/template b/srcpkgs/perl-List-MoreUtils/template index 17e4363286b..7ab538a7139 100644 --- a/srcpkgs/perl-List-MoreUtils/template +++ b/srcpkgs/perl-List-MoreUtils/template @@ -1,6 +1,6 @@ # Template build file for 'perl-List-MoreUtils'. pkgname=perl-List-MoreUtils -version=0.425 +version=0.426 revision=1 wrksrc="List-MoreUtils-$version" build_style=perl-module @@ -13,4 +13,4 @@ maintainer="Leah Neukirchen " homepage="http://search.cpan.org/~rehsack/List-MoreUtils/" license="Apache 2.0, Artistic, GPL-1" distfiles="${CPAN_SITE}/List/List-MoreUtils-${version}.tar.gz" -checksum=28fc33d42181dee0047b19edba55301547943fd90aaa62f0c8b21d1a475b6558 +checksum=8e05610d04c6d0cdb63607d88950fd5c6e850a71cea1e1138ebf5c26c83a47b6 diff --git a/srcpkgs/perl-Mail-Box/template b/srcpkgs/perl-Mail-Box/template index 2539ba050ca..fc1c6f8fac9 100644 --- a/srcpkgs/perl-Mail-Box/template +++ b/srcpkgs/perl-Mail-Box/template @@ -1,6 +1,6 @@ # Template file for 'perl-Mail-Box' pkgname=perl-Mail-Box -version=2.120 +version=3.003 revision=2 noarch=yes wrksrc="${pkgname/perl-/}-${version}" @@ -9,11 +9,11 @@ hostmakedepends="perl" makedepends=" ${hostmakedepends} perl-Devel-GlobalDestruction perl-Digest-HMAC perl-File-Remove perl-IO-stringy perl-MIME-Types perl-Object-Realize-Later - perl-TimeDate perl-MailTools perl-URI perl-User-Identity" + perl-TimeDate perl-MailTools perl-URI perl-User-Identity perl-Mail-Message" depends="${makedepends}" short_desc="Perl module to manage mail folders" maintainer="Alessio Sergi " homepage="http://search.cpan.org/dist/Mail-Box/" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/Mail/${pkgname/perl-/}-${version}.tar.gz" -checksum=da37e74d7a242c16ff2b62da4f75ac881940a64378e798786e490537a79b2113 +checksum=dddea01f63e8db52c42fcb9069aa6a3616874418e6be7a545077c5c0513d5e9e diff --git a/srcpkgs/perl-Mail-Message/template b/srcpkgs/perl-Mail-Message/template new file mode 100644 index 00000000000..16ab17631d3 --- /dev/null +++ b/srcpkgs/perl-Mail-Message/template @@ -0,0 +1,16 @@ +# Template file for 'perl-Mail-Message' +pkgname=perl-Mail-Message +version=3.002 +revision=1 +noarch=yes +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl-IO-stringy perl-MailTools perl-MIME-Types perl-URI perl-User-Identity" +depends="${makedepends}" +short_desc="Container for MIME-encoded message information" +maintainer="maxice8 " +license="Artistic, GPL-1" +homepage="http://search.cpan.org/dist/Mail-Message/" +distfiles="${CPAN_SITE}/Mail/${pkgname/perl-/}-${version}.tar.gz" +checksum=a92f6752a2d58a25cd92fd8857097cf9c5f3cb3c26626937741cd13837beb298 diff --git a/srcpkgs/perl-Net-DNS/template b/srcpkgs/perl-Net-DNS/template index 52f861e6ded..f615dc856c7 100644 --- a/srcpkgs/perl-Net-DNS/template +++ b/srcpkgs/perl-Net-DNS/template @@ -1,6 +1,6 @@ # Template build file for 'perl-Net-DNS'. pkgname=perl-Net-DNS -version=1.12 +version=1.13 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -12,4 +12,4 @@ homepage="https://metacpan.org/pod/Net::DNS" license="Artistic, GPL-1" maintainer="Enno Boland " distfiles="${CPAN_SITE}/Net/Net-DNS-${version}.tar.gz" -checksum=25ff01fe79de3fb759d190fadb0971c326f4afc2e6a4541d10d624f65b34c1ff +checksum=7ec76663365f2f96de46fe07bd6c9d45ab21171ae83954e8d1b816428b518c36 diff --git a/srcpkgs/perl-Sort-Versions/template b/srcpkgs/perl-Sort-Versions/template new file mode 100644 index 00000000000..d145b4f0261 --- /dev/null +++ b/srcpkgs/perl-Sort-Versions/template @@ -0,0 +1,16 @@ +# Template file for 'perl-Sort-Versions' +pkgname=perl-Sort-Versions +version=1.62 +revision=1 +noarch=yes +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="${hostmakedepends}" +depends="${hostmakedepends}" +short_desc="Sort::Versions - a perl 5 module for sorting of revision-like numbers" +maintainer="WantToHelp " +homepage="http://search.cpan.org/dist/Sort-Versions/" +license="Artistic, GPL-1" +distfiles="${CPAN_SITE}/Sort/${pkgname/perl-/}-$version.tar.gz" +checksum=bf5f3307406ebe2581237f025982e8c84f6f6625dd774e457c03f8994efd2eaa diff --git a/srcpkgs/perl-Text-Bidi/template b/srcpkgs/perl-Text-Bidi/template index 76ce0e0b112..619fbc619b6 100644 --- a/srcpkgs/perl-Text-Bidi/template +++ b/srcpkgs/perl-Text-Bidi/template @@ -1,7 +1,7 @@ # Template file for 'perl-Text-Bidi' pkgname=perl-Text-Bidi version=2.12 -revision=1 +revision=2 wrksrc="${pkgname#*-}-${version}" build_style=perl-module hostmakedepends="perl fribidi-devel" @@ -9,9 +9,18 @@ makedepends="perl fribidi-devel" depends="perl" noarch=yes short_desc="Text::Bidi - Unicode bidi algorithm using libfribidi" -maintainer="DirectorX " +maintainer="DirectorX " homepage="https://metacpan.org/pod/Text::Bidi" license="GPL-1, Artistic" distfiles="$CPAN_SITE/Text/Text-Bidi-${version}.tar.gz" checksum=72e700cc4e7f48eb479989cc9d38362d24c58ea6fb1e0fe3390a832903943fa7 nocross=yes + +urxvt-bidi_package() { + depends="${sourcepkg}>=${version}_${revision} rxvt-unicode" + short_desc="Adds bidirectional support to urxvt" + pkg_install() { + vmkdir usr/lib/urxvt/perl + vcopy misc/bidi usr/lib/urxvt/perl + } +} diff --git a/srcpkgs/perl-Text-Bidi/urxvt-bidi.INSTALL.msg b/srcpkgs/perl-Text-Bidi/urxvt-bidi.INSTALL.msg new file mode 100644 index 00000000000..6262719f878 --- /dev/null +++ b/srcpkgs/perl-Text-Bidi/urxvt-bidi.INSTALL.msg @@ -0,0 +1,2 @@ +Add "bidi" to the "urxvt.perl-ext" field in ~/.Xdefaults and enable it by +adding the line: URxvt.bidi.enabled: 1 diff --git a/srcpkgs/perl-Text-Bidi/urxvt-bidi.REMOVE.msg b/srcpkgs/perl-Text-Bidi/urxvt-bidi.REMOVE.msg new file mode 100644 index 00000000000..ecd8b6f2ce8 --- /dev/null +++ b/srcpkgs/perl-Text-Bidi/urxvt-bidi.REMOVE.msg @@ -0,0 +1,2 @@ +Don't forget to remove "bidi" from the "urxvt.perl-ext" field and the line that +enables it in ~/.Xdefaults. diff --git a/srcpkgs/perl-rename/template b/srcpkgs/perl-rename/template index bb95b458c60..12539d05c19 100644 --- a/srcpkgs/perl-rename/template +++ b/srcpkgs/perl-rename/template @@ -17,6 +17,6 @@ makedepends="${hostmakedepends}" depends="${hostmakedepends}" do_install() { - vinstall blib/man1/rename.1p 644 /usr/share/man/man1/ perl-rename.1p - vinstall bin/rename 755 /usr/bin/ perl-rename + vman blib/man1/rename.1p perl-rename.1p + vbin bin/rename perl-rename } diff --git a/srcpkgs/pithos/template b/srcpkgs/pithos/template index 629ee773a7d..3731e08d01d 100644 --- a/srcpkgs/pithos/template +++ b/srcpkgs/pithos/template @@ -1,8 +1,8 @@ # Template file for 'pithos' pkgname=pithos -version=1.3.1 -revision=3 -build_style=gnu-configure +version=1.4.0 +revision=1 +build_style=meson pycompile_module="pithos" makedepends="intltool pkg-config python3 glib-devel" depends="gtk+3 python3-gobject libsecret gst-plugins-good1 gst-libav" @@ -11,4 +11,4 @@ maintainer="osn64 " license="GPL-3" homepage="https://pithos.github.io/" distfiles="https://github.com/pithos/pithos/releases/download/${version}/pithos-${version}.tar.xz" -checksum=cf732bd5c541a55e160d58743e19c2beca69476fae6ead745f0ba6b08615d509 +checksum=4c025d7e1e055292849b80c37d8ad3862e0f2cbd9c7327664deb8ac0389952ac diff --git a/srcpkgs/pjproject/patches/libressl.patch b/srcpkgs/pjproject/patches/libressl.patch index 00970092ec4..a6699851b4d 100644 --- a/srcpkgs/pjproject/patches/libressl.patch +++ b/srcpkgs/pjproject/patches/libressl.patch @@ -36,3 +36,14 @@ int ret; if (ssock->param.sigalgs.ptr && ssock->param.sigalgs.slen) { +--- ssl_sock_ossl.c 2017-09-29 17:33:19.315010416 +0200 ++++ pjlib/src/pj/ssl_sock_ossl.c 2017-09-29 17:35:19.055014980 +0200 +@@ -535,7 +535,7 @@ + pj_assert(status == PJ_SUCCESS); + + /* Init OpenSSL lib */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + SSL_library_init(); + SSL_load_error_strings(); + #else diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template index 5931a477c70..f3a11efa422 100644 --- a/srcpkgs/pjproject/template +++ b/srcpkgs/pjproject/template @@ -2,8 +2,8 @@ # no-third-party.patch comes from Alpine, # and this template is heavily based on Alpine's APKBUILD. pkgname=pjproject -version=2.6 -revision=2 +version=2.7 +revision=1 disable_parallel_build=yes build_style=gnu-configure configure_args="--enable-shared \ @@ -23,7 +23,7 @@ maintainer="Christopher Brannon " license="GPL-2" homepage="http://www.pjsip.org/pjsua.htm" distfiles="http://www.pjsip.org/release/${version}/${pkgname}-${version}.tar.bz2" -checksum=2f5a1da1c174d845871c758bd80fbb580fca7799d3cfaa0d3c4e082b5161c7b4 +checksum=1c80621a11c39151b3c2511f06abc8ef031fc712bb2f9e9923b5301b04b28f6b pre_configure() { export LD="${CC}" diff --git a/srcpkgs/pkgconf/template b/srcpkgs/pkgconf/template index 0fce5964b46..43dd67df5d4 100644 --- a/srcpkgs/pkgconf/template +++ b/srcpkgs/pkgconf/template @@ -1,6 +1,6 @@ # Template file for 'pkgconf' pkgname=pkgconf -version=1.3.9 +version=1.3.10 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" @@ -9,9 +9,13 @@ maintainer="Enno Boland " license="MIT" homepage="https://github.com/pkgconf/pkgconf" distfiles="$homepage/archive/$pkgname-$version.tar.gz" -checksum=1e70161af120f5715710c4eff48c9e3447394ebd724c6a09bdfbb8dcf3e6f6f8 +checksum=b5d3e81297ebb0e00e0cb1d74583531cf0b20ada37e58193a55cac07e5a92b93 wrksrc="$pkgname-$pkgname-$version" +post_install() { + vlicense COPYING +} + pre_configure() { autoreconf -fi } diff --git a/srcpkgs/polybar/INSTALL.msg b/srcpkgs/polybar/INSTALL.msg index 77529c11a7c..cc519e450dc 100644 --- a/srcpkgs/polybar/INSTALL.msg +++ b/srcpkgs/polybar/INSTALL.msg @@ -1,7 +1,7 @@ Get started with the example configuration: - $ install -Dm644 /usr/share/doc/polybar/config $HOME/.config/polybar + $ install -Dm644 /usr/share/doc/polybar/config $HOME/.config/polybar/config $ polybar example diff --git a/srcpkgs/poppler/patches/0001-do-not-install-function.cc-as-it-s-not-a-header.patch b/srcpkgs/poppler/patches/0001-do-not-install-function.cc-as-it-s-not-a-header.patch new file mode 100644 index 00000000000..0ef234ca11b --- /dev/null +++ b/srcpkgs/poppler/patches/0001-do-not-install-function.cc-as-it-s-not-a-header.patch @@ -0,0 +1,21 @@ +From 369cd504e70e55378c6395355056fa8676679e56 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Fri, 6 Oct 2017 08:07:35 +0200 +Subject: do not install Function.cc, as it's not a header + + +diff --git CMakeLists.txt.orig CMakeLists.txt +index 7485b2a..fe5911c 100644 +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -572,7 +572,6 @@ if(ENABLE_XPDF_HEADERS) + poppler/FontEncodingTables.h + poppler/FontInfo.h + poppler/Form.h +- poppler/Function.cc + poppler/Function.h + poppler/Gfx.h + poppler/GfxFont.h +-- +cgit v0.10.2 + diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template index d64ce4b611b..691fbf6e50a 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -4,7 +4,7 @@ # pkgname=poppler version=0.60.1 -revision=1 +revision=2 build_style=cmake configure_args="-DENABLE_XPDF_HEADERS=on $(vopt_if gir -DENABLE_GLIB=on) -DENABLE_QT4=off -DENABLE_QT5=off" diff --git a/srcpkgs/popt/template b/srcpkgs/popt/template index 960b6904b20..d625e74dcbf 100644 --- a/srcpkgs/popt/template +++ b/srcpkgs/popt/template @@ -1,7 +1,7 @@ # Template file for 'popt' pkgname=popt version=1.16 -revision=6 +revision=7 build_style=gnu-configure short_desc="Command line option parsing library" maintainer="Juan RP " @@ -10,6 +10,10 @@ license="MIT" distfiles="http://rpm5.org/files/$pkgname/$pkgname-$version.tar.gz" checksum=e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8 +post_install() { + vlicense COPYING +} + popt-devel_package() { depends="popt>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/proplib/template b/srcpkgs/proplib/template index b09facc7bc6..75e4f348b7f 100644 --- a/srcpkgs/proplib/template +++ b/srcpkgs/proplib/template @@ -1,7 +1,7 @@ # Template file for 'proplib' pkgname=proplib version=0.6.4 -revision=2 +revision=3 wrksrc="portableproplib-${version}" build_style=gnu-configure hostmakedepends="automake libtool" @@ -13,6 +13,10 @@ homepage="https://github.com/xtraeme/portableproplib" distfiles="https://github.com/xtraeme/portableproplib/archive/${version}.tar.gz" checksum=b2edac8977fa2e569e8664976d9c27f272bcf13f1aa921e853f129b7fd6b5d86 +post_install() { + vlicense COPYING +} + pre_configure() { ./bootstrap } diff --git a/srcpkgs/psutils/patches/psutils.patch b/srcpkgs/psutils/patches/psutils.patch index e280ac1c541..cd47675766d 100644 --- a/srcpkgs/psutils/patches/psutils.patch +++ b/srcpkgs/psutils/patches/psutils.patch @@ -230,7 +230,7 @@ diff -rupN psutils/README.voidlinux psutils-new/README.voidlinux +This version of psutils is patched from debian sources and has a patched Makefile to +build and install in voidlinux. + -+Please report any error to voidlinux mantainer and not upstrean or to debian mantainer ++Please report any error to voidlinux maintainer and not upstrean or to debian maintainer + +It install only theese files: + diff --git a/srcpkgs/pulsemixer/template b/srcpkgs/pulsemixer/template new file mode 100644 index 00000000000..bea569ecd0b --- /dev/null +++ b/srcpkgs/pulsemixer/template @@ -0,0 +1,19 @@ +# Template file for 'pulsemixer' +pkgname=pulsemixer +version=1.3.0 +revision=1 +noarch=yes +build_style=python3-module +hostmakedepends="python3 python3-setuptools" +depends="pulseaudio" +short_desc="CLI and curses mixer for Pulseaudio" +maintainer="Dean Thomson " +license="MIT" +wrksrc="${pkgname}-${version}-license" +homepage="https://github.com/GeorgeFilipkin/pulsemixer" +distfiles="https://github.com/GeorgeFilipkin/${pkgname}/archive/${version}-license.tar.gz" +checksum=dba1f804d3a455b0569522debfc0046fac9e6c8d1642eab7e62a1200aadf8ca7 + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/python-Django/template b/srcpkgs/python-Django/template index 3023b3a5430..416307a6686 100644 --- a/srcpkgs/python-Django/template +++ b/srcpkgs/python-Django/template @@ -1,6 +1,6 @@ # Template file for 'python-Django' pkgname=python-Django -version=1.11.5 +version=1.11.6 revision=1 noarch=yes wrksrc="Django-${version}" @@ -13,7 +13,7 @@ maintainer="Eivind Uggedal " license="3-clause-BSD" homepage="https://www.djangoproject.com/" distfiles="${PYPI_SITE}/D/Django/Django-${version}.tar.gz" -checksum=1836878162dfdf865492bacfdff0321e4ee8f1e7d51d93192546000b54982b29 +checksum=c3b42ca1efa1c0a129a9e863134cc3fe705c651dea3a04a7998019e522af0c60 alternatives="django:django-admin:/usr/bin/django-admin2" post_install() { diff --git a/srcpkgs/python-GitPython/template b/srcpkgs/python-GitPython/template index ed9a27d4582..8be717ee619 100644 --- a/srcpkgs/python-GitPython/template +++ b/srcpkgs/python-GitPython/template @@ -1,7 +1,7 @@ # Template file for 'python-GitPython' pkgname=python-GitPython -version=2.1.5 -revision=2 +version=2.1.7 +revision=1 noarch=yes wrksrc="GitPython-${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Joseph LaFreniere " homepage="https://github.com/gitpython-developers/GitPython" license="3-clause-BSD" distfiles="${PYPI_SITE}/G/GitPython/GitPython-${version}.tar.gz" -checksum=5c00cbd256e2b1d039381d4f7d71fcb7ee5cc196ca10c101ff7191bd82ab5d9c +checksum=13c7cd99c2bf277fc99accfc25148752fa90e7cc6c6d08a3f01d229dacb461d9 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-M2Crypto/patches/libressl.patch b/srcpkgs/python-M2Crypto/patches/libressl.patch new file mode 100644 index 00000000000..54620a6afb3 --- /dev/null +++ b/srcpkgs/python-M2Crypto/patches/libressl.patch @@ -0,0 +1,148 @@ +--- SWIG/_bio.i.orig ++++ SWIG/_bio.i +@@ -63,14 +63,14 @@ extern BIO *BIO_pop(BIO *); + static PyObject *_bio_err; + + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + void pyfd_init(void); + #endif + + void bio_init(PyObject *bio_err) { + Py_INCREF(bio_err); + _bio_err = bio_err; +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + pyfd_init(); + #endif + } +@@ -299,7 +299,7 @@ int bio_should_write(BIO* a) { + return BIO_should_write(a); + } + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + /* implment custom BIO_s_pyfd */ + + #ifdef WIN32 +--- SWIG/_evp.i.orig ++++ SWIG/_evp.i +@@ -19,7 +19,7 @@ Copyright (c) 2009-2010 Heikki Toivonen. All rights re + #include + #include + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + + HMAC_CTX *HMAC_CTX_new(void) { + HMAC_CTX *ret = PyMem_Malloc(sizeof(HMAC_CTX)); +--- SWIG/_lib11_compat.i.orig ++++ SWIG/_lib11_compat.i +@@ -8,7 +8,7 @@ + */ + + %{ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + + #include + #include +--- SWIG/_lib.i.orig ++++ SWIG/_lib.i +@@ -18,7 +18,7 @@ + + %{ + /* OpenSSL 1.0.2 copmatbility shim */ +-#if OPENSSL_VERSION_NUMBER < 0x10002000L ++#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER) + typedef void (*OPENSSL_sk_freefunc)(void *); + typedef void *(*OPENSSL_sk_copyfunc)(const void *); + typedef struct stack_st OPENSSL_STACK; +@@ -501,7 +501,7 @@ int passphrase_callback(char *buf, int num, int v, voi + %inline %{ + + void lib_init() { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + SSLeay_add_all_algorithms(); + ERR_load_ERR_strings(); + #endif +--- SWIG/_ssl.i.orig ++++ SWIG/_ssl.i +@@ -268,7 +268,7 @@ void ssl_init(PyObject *ssl_err, PyObject *ssl_timeout + + #ifndef OPENSSL_NO_SSL3 + const SSL_METHOD *sslv3_method(void) { +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + PyErr_WarnEx(PyExc_DeprecationWarning, + "Function SSLv3_method has been deprecated.", 1); + #endif +@@ -277,7 +277,7 @@ const SSL_METHOD *sslv3_method(void) { + #endif + + const SSL_METHOD *tlsv1_method(void) { +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + PyErr_WarnEx(PyExc_DeprecationWarning, + "Function TLSv1_method has been deprecated.", 1); + #endif +--- SWIG/_threads.i.orig ++++ SWIG/_threads.i +@@ -5,7 +5,7 @@ + #include + #include + +-#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #define CRYPTO_num_locks() (CRYPTO_NUM_LOCKS) + static PyThread_type_lock lock_cs[CRYPTO_num_locks()]; + static long lock_count[CRYPTO_num_locks()]; +@@ -13,7 +13,7 @@ static int thread_mode = 0; + #endif + + void threading_locking_callback(int mode, int type, const char *file, int line) { +-#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + if (mode & CRYPTO_LOCK) { + PyThread_acquire_lock(lock_cs[type], WAIT_LOCK); + lock_count[type]++; +@@ -25,7 +25,7 @@ void threading_locking_callback(int mode, int type, co + } + + unsigned long threading_id_callback(void) { +-#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + return (unsigned long)PyThread_get_thread_ident(); + #else + return (unsigned long)0; +@@ -35,7 +35,7 @@ unsigned long threading_id_callback(void) { + + %inline %{ + void threading_init(void) { +-#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + int i; + if (!thread_mode) { + for (i=0; i + #include diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template index 702a3f0ba9e..0555d7537c7 100644 --- a/srcpkgs/python-M2Crypto/template +++ b/srcpkgs/python-M2Crypto/template @@ -1,7 +1,7 @@ # Template file for 'python-M2Crypto' pkgname=python-M2Crypto version=0.27.0 -revision=1 +revision=2 wrksrc="M2Crypto-${version}" build_style=python2-module pycompile_module="M2Crypto" diff --git a/srcpkgs/python-bcrypt/template b/srcpkgs/python-bcrypt/template index e1e40f102b8..75398763e91 100644 --- a/srcpkgs/python-bcrypt/template +++ b/srcpkgs/python-bcrypt/template @@ -1,7 +1,7 @@ # Template file for 'python-bcrypt' pkgname=python-bcrypt -version=3.1.3 -revision=2 +version=3.1.4 +revision=1 wrksrc="bcrypt-${version}" build_style=python-module pycompile_module="bcrypt" @@ -10,10 +10,10 @@ makedepends="python-devel python3-devel python-cffi python3-cffi" depends="python-cffi python-six" short_desc="Modern password hashing for software and servers (Python2)" maintainer="Alessio Sergi " -homepage="https://github.com/pyca/bcrypt/" +homepage="https://github.com/pyca/bcrypt" license="Apache-2.0" distfiles="${PYPI_SITE}/b/bcrypt/bcrypt-${version}.tar.gz" -checksum=6645c8d0ad845308de3eb9be98b6fd22a46ec5412bfc664a423e411cdd8f5488 +checksum=67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d python3-bcrypt_package() { pycompile_module="bcrypt" diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template index 56439812eee..99e338d7326 100644 --- a/srcpkgs/python-cffi/template +++ b/srcpkgs/python-cffi/template @@ -1,6 +1,6 @@ # Template file for 'python-cffi' pkgname=python-cffi -version=1.11.0 +version=1.11.2 revision=1 wrksrc="cffi-${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://cffi.readthedocs.io/" license="MIT" distfiles="${PYPI_SITE}/c/cffi/cffi-${version}.tar.gz" -checksum=5f4ff33371c6969b39b293d9771ee91e81d26f9129be093ca1b7be357fcefd15 +checksum=ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-chess/template b/srcpkgs/python-chess/template index cec478e2b18..93e8d9f5713 100644 --- a/srcpkgs/python-chess/template +++ b/srcpkgs/python-chess/template @@ -1,7 +1,7 @@ # Template file for 'python-chess' pkgname=python-chess -version=0.19.0 -revision=2 +version=0.20.1 +revision=1 noarch=yes build_style=python-module pycompile_module="chess" @@ -12,7 +12,7 @@ maintainer="cipr3s " license="GPL-3" homepage="https://github.com/niklasf/python-chess" distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=afac4adfd35ebbce0c6ec81f9d6240516a69c8404bb186c8e551efda636ca5e0 +checksum=988f6422c733c6e836d2585598f921a4ef5bd73ac90b814f8f272eb27cb83c7c python3-chess_package() { noarch=yes diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template index 0a7bda2165f..a853c8415f6 100644 --- a/srcpkgs/python-cryptography/template +++ b/srcpkgs/python-cryptography/template @@ -1,7 +1,7 @@ # Template file for 'python-cryptography' pkgname=python-cryptography -version=2.0.3 -revision=2 +version=2.1.1 +revision=1 wrksrc="cryptography-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools libressl-devel @@ -16,7 +16,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/pyca/cryptography" license="3-clause-BSD, Apache-2.0" distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz" -checksum=d04bb2425086c3fe86f7bc48915290b13e798497839fbb18ab7f6dffcf98cc3a +checksum=2699ed21e1f73dd1bdb7b0b22a517295de07809d535b23e200dd22166037fe6f post_install() { vlicense LICENSE diff --git a/srcpkgs/python-cycler/template b/srcpkgs/python-cycler/template index 08a37c87c24..09f34f7ecba 100644 --- a/srcpkgs/python-cycler/template +++ b/srcpkgs/python-cycler/template @@ -1,7 +1,7 @@ # Template file for 'python-cycler' pkgname=python-cycler version=0.10.0 -revision=3 +revision=4 noarch=yes wrksrc="cycler-${version}" build_style=python-module @@ -15,6 +15,10 @@ license="3-clause-BSD" distfiles="${PYPI_SITE}/C/Cycler/cycler-${version}.tar.gz" checksum=cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8 +post_install() { + vlicense LICENSE +} + python3-cycler_package() { noarch=yes depends="python3-six" @@ -23,6 +27,7 @@ python3-cycler_package() { short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* + vlicense LICENSE } } python3.4-cycler_package() { diff --git a/srcpkgs/python-gitdb/template b/srcpkgs/python-gitdb/template index 07563407af2..e5307c0c934 100644 --- a/srcpkgs/python-gitdb/template +++ b/srcpkgs/python-gitdb/template @@ -1,7 +1,7 @@ # Template file for 'python-gitdb' pkgname=python-gitdb -version=2.0.2 -revision=2 +version=2.0.3 +revision=1 noarch=yes wrksrc="gitdb2-${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Joseph LaFreniere " homepage="https://github.com/gitpython-developers/gitdb" license="BSD" distfiles="${PYPI_SITE}/g/gitdb2/gitdb2-${version}.tar.gz" -checksum=f2e36d7561e91f30a6a44858756dc020d8f1e81ca6e4185979d5c6c24c648070 +checksum=b60e29d4533e5e25bb50b7678bbc187c8f6bcff1344b4f293b2ba55c85795f09 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-gitlab/template b/srcpkgs/python-gitlab/template index 9317049673f..8071196406f 100644 --- a/srcpkgs/python-gitlab/template +++ b/srcpkgs/python-gitlab/template @@ -1,7 +1,7 @@ # Template file for 'python-gitlab' pkgname=python-gitlab -version=0.21.2 -revision=2 +version=1.0.1 +revision=1 noarch=yes build_style=python-module pycompile_module="gitlab" @@ -12,7 +12,7 @@ maintainer="Joseph LaFreniere " homepage="https://github.com/gpocentek/python-gitlab" license="LGPL-3" distfiles="${PYPI_SITE}/p/python-gitlab/python-gitlab-${version}.tar.gz" -checksum=abc9a89d29553529e95356260b445cdd49b46423e85a6d3eada4a35b14e309b7 +checksum=8f118501ff679717b9932d1aee8086fdf4c122212920ae6937901d81711c3b7c alternatives="python-gitlab:gitlab:/usr/bin/gitlab2" python3-gitlab_package() { diff --git a/srcpkgs/python-gnupg/template b/srcpkgs/python-gnupg/template new file mode 100644 index 00000000000..efa6b44b329 --- /dev/null +++ b/srcpkgs/python-gnupg/template @@ -0,0 +1,25 @@ +# Template file for 'python-gnupg' +pkgname=python-gnupg +version=0.4.1 +revision=1 +noarch=yes +build_style=python-module +hostmakedepends="python-setuptools python3-setuptools" +depends="python gnupg" +pycompile_module="gnupg.py" +short_desc="Python2 wrapper for GnuPG" +maintainer="Lon Willett " +license="GPL-3" +homepage="https://bitbucket.org/vinay.sajip/python-gnupg" +distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=ef47b02eaf41dee3cf4b02ddf83130827318de9fe3eae89d01a3f05859e20e1a + +python3-gnupg_package() { + depends="python3 gnupg" + short_desc="${short_desc/Python2/Python3}" + pycompile_module="gnupg.py" + noarch=yes + pkg_install() { + vmove usr/lib/python3* + } +} diff --git a/srcpkgs/python-gnupg/update b/srcpkgs/python-gnupg/update new file mode 100644 index 00000000000..1ddb53a8912 --- /dev/null +++ b/srcpkgs/python-gnupg/update @@ -0,0 +1,3 @@ +package="python-gnupg" +site="https://pypi.python.org/pypi/python-gnupg" +pattern='python-gnupg \K[\d.]+' diff --git a/srcpkgs/python-isodate/template b/srcpkgs/python-isodate/template index 009be6c2930..b877c8251b0 100644 --- a/srcpkgs/python-isodate/template +++ b/srcpkgs/python-isodate/template @@ -1,28 +1,34 @@ # Template file for 'python-isodate' pkgname=python-isodate -version=0.5.4 -revision=3 +version=0.6.0 +revision=1 noarch=yes wrksrc="isodate-${version}" build_style=python-module -hostmakedepends="python-setuptools python3-setuptools" -depends="python" pycompile_module="isodate" +hostmakedepends="python-setuptools python3-setuptools" +depends="python-six" short_desc="ISO 8601 date/time/duration parser and formatter (Python2)" maintainer="Juan RP " -homepage="https://pypi.python.org/pypi/isodate/" -license="BSD" +homepage="https://github.com/gweis/isodate" +license="3-clause-BSD" distfiles="${PYPI_SITE}/i/isodate/isodate-${version}.tar.gz" -checksum=42105c41d037246dc1987e36d96f3752ffd5c0c24834dd12e4fdbe1e79544e31 +checksum=2e364a3d5759479cdb2d37cce6b9376ea504db2ff90252a2e5b7cc89cc9ff2d8 + +post_install() { + sed -n '/Copyright/,/CONTRACT/p' src/isodate/__init__.py >LICENSE + vlicense LICENSE +} python3-isodate_package() { noarch=yes - depends="python3" + depends="python3-six" pycompile_module="isodate" replaces="python3.4-isodate>=0" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* + vlicense LICENSE } } python3.4-isodate_package() { diff --git a/srcpkgs/python-jmespath/template b/srcpkgs/python-jmespath/template new file mode 100644 index 00000000000..ed3cba3d84c --- /dev/null +++ b/srcpkgs/python-jmespath/template @@ -0,0 +1,30 @@ +# Template file for 'python-jmespath' +pkgname=python-jmespath +version=0.9.3 +revision=1 +wrksrc="jmespath.py-${version}" +build_style=python-module +pycompile_module=jmespath +noarch=yes +hostmakedepends="python-setuptools python3-setuptools" +makedepends="python-devel python3-devel" +short_desc="JSON Query language for Python2" +maintainer="yopito " +license="MIT" +homepage="http://jmespath.org" +distfiles="https://github.com/jmespath/jmespath.py/archive/${version}.tar.gz" +checksum=88ca5ca1e1718e9c476f6904469de18a02ec8306e077ed58983b5050ab7348ac + +post_install() { + vlicense LICENSE.txt +} + +python3-jmespath_package() { + pycompile_module=jmespath + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vlicense LICENSE.txt + vmove usr/lib/python3* + vmove /usr/bin/jp.py3 + } +} diff --git a/srcpkgs/python-jupyter_ipywidgets/template b/srcpkgs/python-jupyter_ipywidgets/template index 0dc59e0ce66..5ae56e91ac8 100644 --- a/srcpkgs/python-jupyter_ipywidgets/template +++ b/srcpkgs/python-jupyter_ipywidgets/template @@ -1,6 +1,6 @@ # Template file for 'python-jupyter_ipywidgets' pkgname=python-jupyter_ipywidgets -version=7.0.1 +version=7.0.2 revision=1 noarch=yes wrksrc="ipywidgets-${version}" @@ -14,7 +14,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/jupyter-widgets/ipywidgets" license="3-clause-BSD" distfiles="${PYPI_SITE}/i/ipywidgets/ipywidgets-${version}.tar.gz" -checksum=8692b6656c7f492ca3b08441fdd44ac311860282ca5eac7b4f68d1f1cbdef43d +checksum=cc602fb77f8d979c3d7fd90f7a28842dde8514554e1efddc94b39ee7e3046cde post_install() { vlicense COPYING.md LICENSE diff --git a/srcpkgs/python-jupyter_notebook/template b/srcpkgs/python-jupyter_notebook/template index 1ae5d557a7f..d0001861ac7 100644 --- a/srcpkgs/python-jupyter_notebook/template +++ b/srcpkgs/python-jupyter_notebook/template @@ -1,6 +1,6 @@ # Template file for 'python-jupyter_notebook' pkgname=python-jupyter_notebook -version=5.1.0 +version=5.2.0 revision=1 noarch=yes wrksrc="notebook-${version}" @@ -16,7 +16,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/jupyter/notebook" license="3-clause-BSD" distfiles="${PYPI_SITE}/n/notebook/notebook-${version}.tar.gz" -checksum=c35fccb55250688303f6ef35c3870f6f5a8df885ff4d9e5cfe1176a87be7fdda +checksum=7fafcd1ae638bd70bca3621982a69ccdc47ea19b234694073b617f59e79403ea alternatives=" jupyter-notebook:jupyter-notebook:/usr/bin/jupyter-notebook2 diff --git a/srcpkgs/python-jupyter_widgetsnbextension/template b/srcpkgs/python-jupyter_widgetsnbextension/template index 32268968ad9..1d2bc42dd94 100644 --- a/srcpkgs/python-jupyter_widgetsnbextension/template +++ b/srcpkgs/python-jupyter_widgetsnbextension/template @@ -1,6 +1,6 @@ # Template file for 'python-jupyter_widgetsnbextension' pkgname=python-jupyter_widgetsnbextension -version=3.0.3 +version=3.0.4 revision=1 noarch=yes wrksrc="widgetsnbextension-${version}" @@ -14,7 +14,7 @@ maintainer="Alessio Sergi " homepage="https://pypi.python.org/pypi/widgetsnbextension" license="3-clause-BSD" distfiles="${PYPI_SITE}/w/widgetsnbextension/widgetsnbextension-${version}.tar.gz" -checksum=ed242439c6407a7a9dc1aaa208198a93ef749ed1f930eba2b94ea94d49cabaa6 +checksum=b438aab5b127b8daba57f88202316ea01b53b3bba8a28053d97b979f047cdefa python3-jupyter_widgetsnbextension_package() { noarch=yes diff --git a/srcpkgs/python-kitchen/template b/srcpkgs/python-kitchen/template new file mode 100644 index 00000000000..896de751d29 --- /dev/null +++ b/srcpkgs/python-kitchen/template @@ -0,0 +1,29 @@ +# Template file for 'python-kitchen' +pkgname=python-kitchen +version=1.2.5 +revision=1 +noarch=yes +wrksrc="${pkgname#*-}-${version}" +build_style=python-module +pycompile_module="kitchen" +hostmakedepends="python-setuptools python3-setuptools" +short_desc="Python2 useful snippets" +maintainer="dleeram " +license="LGPL-2" +homepage="https://github.com/fedora-infra/kitchen" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=1258af80868fc8c30170a43040b1eb5434bc5ffa5ff4ab98ffb9ee3d3c1e2f76 + +post_install() { + vlicense COPYING LICENSE +} + +python3-kitchen_package() { + noarch=yes + pycompile_module="kitchen" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + vlicense COPYING LICENSE + } +} diff --git a/srcpkgs/python-ldap/template b/srcpkgs/python-ldap/template index b07172edde9..6938d9003b6 100644 --- a/srcpkgs/python-ldap/template +++ b/srcpkgs/python-ldap/template @@ -1,6 +1,6 @@ # Template file for 'python-ldap' pkgname=python-ldap -version=2.4.44 +version=2.4.45 revision=1 build_style=python2-module pycompile_module="ldap lidf.py dsml.py ldapurl.py slapdtest.py" @@ -12,7 +12,7 @@ maintainer="Michael Aldridge " license="PSF" homepage="https://www.python-ldap.org" distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=70ec4eb6c71c3b4f07a5c4e2ae76bb322d11019efcb04c306d87e857ea4e1841 +checksum=824fde180a53772e23edc031c4dd64ac1af4a3eade78f00d9d510937d562f64e pre_build() { sed -i "s,/usr/include/sasl,${XBPS_CROSS_BASE}/usr/include/sasl," setup.cfg diff --git a/srcpkgs/python-llfuse/template b/srcpkgs/python-llfuse/template index 89d524d3170..e54671c9e33 100644 --- a/srcpkgs/python-llfuse/template +++ b/srcpkgs/python-llfuse/template @@ -1,7 +1,7 @@ # Template file for 'python-llfuse' pkgname=python-llfuse -version=1.1.1 -revision=6 +version=1.3 +revision=1 wrksrc="llfuse-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools pkg-config" @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="LGPL-2" homepage="https://bitbucket.org/nikratio/python-llfuse/" distfiles="${PYPI_SITE}/l/llfuse/llfuse-${version}.tar.bz2" -checksum=1b84b1152ae461e66ecc526d0de71eaec086c587e97d1dda93d620b16a92db6c +checksum=d1ab2c7cdaeed1c4c99882f2ad44df3906db263b832d76de18291e484c685bd2 python3-llfuse_package() { depends="python3" diff --git a/srcpkgs/python-lxml/template b/srcpkgs/python-lxml/template index 233e4a68865..abb1153c554 100644 --- a/srcpkgs/python-lxml/template +++ b/srcpkgs/python-lxml/template @@ -1,6 +1,6 @@ # Template file for 'python-lxml' pkgname=python-lxml -version=4.0.0 +version=4.1.0 revision=1 wrksrc="lxml-lxml-${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://lxml.de/" license="3-clause-BSD, ElementTree, GPL-2, ZPL-2.0" distfiles="https://github.com/lxml/lxml/archive/lxml-${version}.tar.gz" -checksum=51b04cc61046713bf4a0eea6ec91403cec1de780bfde348fba2a24e3b463c94e +checksum=84dfc7c2ccadcf759fce8e63266620d74ca0d42c51c2877abaa64be1c2b42c4d post_install() { vlicense LICENSES.txt LICENSES diff --git a/srcpkgs/python-mechanize/template b/srcpkgs/python-mechanize/template index 16c35c276c1..d7f17db4e60 100644 --- a/srcpkgs/python-mechanize/template +++ b/srcpkgs/python-mechanize/template @@ -1,7 +1,7 @@ # Template file for 'python-mechanize' pkgname=python-mechanize -version=0.3.5 -revision=2 +version=0.3.6 +revision=1 wrksrc="mechanize-${version}" noarch=yes build_style=python2-module @@ -13,7 +13,7 @@ maintainer="Farhad Shahbazi " license="BSD" homepage="https://github.com/python-mechanize/mechanize" distfiles="https://github.com/python-mechanize/mechanize/archive/v${version}.tar.gz" -checksum=c386dbb992df8c59eb80f65205e0e0d907d3a8fe1e9a5a9b9c83785decec8438 +checksum=377ca7b2160716857a2035d986abba1c133f4f80939c19002333c82bd4c01e98 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-oauthlib/template b/srcpkgs/python-oauthlib/template index cae888a523b..c0d3ac6376a 100644 --- a/srcpkgs/python-oauthlib/template +++ b/srcpkgs/python-oauthlib/template @@ -1,6 +1,6 @@ # Template file for 'python-oauthlib' pkgname=python-oauthlib -version=2.0.4 +version=2.0.5 revision=1 noarch=yes wrksrc="${pkgname#*-}-${version}" @@ -13,7 +13,7 @@ maintainer="Eivind Uggedal " license="3-clause-BSD" homepage="https://github.com/idan/oauthlib" distfiles="${PYPI_SITE}/o/oauthlib/oauthlib-${version}.tar.gz" -checksum=514e293cb356dd53d596692207d48d9231b997995c9a4167eefa868583d74d13 +checksum=6b12ab356047664e5554c01ff2d4d5d5bbb33cb6ab94076f6fdafa783b257537 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-polib/template b/srcpkgs/python-polib/template index d8c56a5858b..19f877936ef 100644 --- a/srcpkgs/python-polib/template +++ b/srcpkgs/python-polib/template @@ -1,7 +1,7 @@ # Template file for 'python-polib' pkgname=python-polib version=1.0.8 -revision=2 +revision=3 noarch=yes wrksrc="polib-${version}" build_style=python-module @@ -15,6 +15,10 @@ license="MIT" distfiles="${PYPI_SITE}/p/polib/polib-${version}.tar.gz" checksum=5affe3d915eb5b4773f4ce164817e383eea0306115cdaf9b64008b3aea8202df +post_install() { + vlicense LICENSE +} + python3-polib_package() { noarch=yes depends="python3" @@ -23,6 +27,7 @@ python3-polib_package() { short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* + vlicense LICENSE } } python3.4-polib_package() { diff --git a/srcpkgs/python-psutil/template b/srcpkgs/python-psutil/template index f7a74fb8e10..e45952458a7 100644 --- a/srcpkgs/python-psutil/template +++ b/srcpkgs/python-psutil/template @@ -1,6 +1,6 @@ # Template file for 'python-psutil' pkgname=python-psutil -version=5.3.1 +version=5.4.0 revision=1 wrksrc="psutil-${version}" build_style=python-module @@ -12,7 +12,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/giampaolo/psutil" license="3-clause-BSD" distfiles="${PYPI_SITE}/p/psutil/psutil-${version}.tar.gz" -checksum=12dd9c8abbad15f055e9579130035b38617020ce176f4a498b7870e6321ffa67 +checksum=8e6397ec24a2ec09751447d9f169486b68b37ac7a8d794dca003ace4efaafc6a post_install() { vlicense LICENSE diff --git a/srcpkgs/python-pyasn1-modules/template b/srcpkgs/python-pyasn1-modules/template index dffa52f998e..ba7fad47975 100644 --- a/srcpkgs/python-pyasn1-modules/template +++ b/srcpkgs/python-pyasn1-modules/template @@ -1,6 +1,6 @@ # Template file for 'python-pyasn1-modules' pkgname=python-pyasn1-modules -version=0.1.4 +version=0.1.5 revision=1 noarch=yes wrksrc="${pkgname#*-}-${version}" @@ -13,7 +13,7 @@ maintainer="Peter Bui " license="2-clause-BSD" homepage="https://github.com/etingof/pyasn1-modules" distfiles="${PYPI_SITE}/p/pyasn1-modules/pyasn1-modules-${version}.tar.gz" -checksum=b07c17bdb34d6f64aafea6269f2e8fb306a57473f0f38d9a6ca389d6ab30ac4a +checksum=1d303eed5aa54cafeca209d16b8c7ea2c6064735fb61f1bee2e0ed63a0816988 post_install() { vlicense LICENSE.txt LICENSE diff --git a/srcpkgs/python-pyasn1/template b/srcpkgs/python-pyasn1/template index 9a0ae2d3ab7..3fc0423d162 100644 --- a/srcpkgs/python-pyasn1/template +++ b/srcpkgs/python-pyasn1/template @@ -1,6 +1,6 @@ # Template file for 'python-pyasn1' pkgname=python-pyasn1 -version=0.3.6 +version=0.3.7 revision=1 noarch=yes wrksrc="pyasn1-${version}" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/etingof/pyasn1" license="2-clause-BSD" distfiles="${PYPI_SITE}/p/pyasn1/pyasn1-${version}.tar.gz" -checksum=f0380ea97db0ede095a0dd87ce3003d46c197191f924206e43f776fc77e51f09 +checksum=187f2a66d617683f8e82d5c00033b7c8a0287e1da88a9d577aebec321cad4965 post_install() { vlicense LICENSE.rst LICENSE diff --git a/srcpkgs/python-setuptools/template b/srcpkgs/python-setuptools/template index 40cb9a1b811..888d027e26a 100644 --- a/srcpkgs/python-setuptools/template +++ b/srcpkgs/python-setuptools/template @@ -1,6 +1,6 @@ # Template file for 'python-setuptools' pkgname=python-setuptools -version=36.5.0 +version=36.6.0 revision=1 noarch=yes wrksrc="setuptools-${version}" @@ -15,7 +15,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/pypa/setuptools" license="MIT" distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.zip" -checksum=ce2007c1cea3359870b80657d634253a0765b0c7dc5a988d77ba803fc86f2c64 +checksum=62074589522a798da243f47348f38020d55b6c945652e2f2c09d3a96299812b7 alternatives="setuptools:easy_install:/usr/bin/easy_install2" export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 diff --git a/srcpkgs/python-stevedore/template b/srcpkgs/python-stevedore/template index 27e15066136..036207c3e33 100644 --- a/srcpkgs/python-stevedore/template +++ b/srcpkgs/python-stevedore/template @@ -1,6 +1,6 @@ # Template file for 'python-stevedore' pkgname=python-stevedore -version=1.27.0 +version=1.27.1 revision=1 noarch=yes wrksrc="stevedore-${version}" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://git.openstack.org/cgit/openstack/stevedore" license="Apache-2.0" distfiles="${PYPI_SITE}/s/stevedore/stevedore-${version}.tar.gz" -checksum=c1e53d6c5921be2001e8666cf7cad224aaaee1be6963444f0ea5a7595884fc1a +checksum=236468dae36707069e8b3bdb455e9f1be090b1e6b937f4ac0c56a538d6f50be0 pre_build() { # remove dependency on pbr; it's not a runtime dependency diff --git a/srcpkgs/python-texttable/template b/srcpkgs/python-texttable/template index e3a13ecad73..abe4ea35243 100644 --- a/srcpkgs/python-texttable/template +++ b/srcpkgs/python-texttable/template @@ -1,7 +1,7 @@ # Template file for 'python-texttable' pkgname=python-texttable -version=0.9.1 -revision=2 +version=1.0.0 +revision=1 noarch=yes wrksrc="texttable-${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Sergi Alvarez " homepage="https://github.com/foutaise/texttable/" license="LGPL-3" distfiles="${PYPI_SITE}/t/texttable/texttable-${version}.tar.gz" -checksum=119041773ff03596b56392532f9315cb3a3116e404fd6f36e76a7dc088d95c79 +checksum=a733f7d90f6dd35d799c4048e3b015fcf95887ef49e0ef65262f90ee6d7abd61 python3-texttable_package() { noarch=yes diff --git a/srcpkgs/python-tweepy/template b/srcpkgs/python-tweepy/template new file mode 100644 index 00000000000..4cabd769381 --- /dev/null +++ b/srcpkgs/python-tweepy/template @@ -0,0 +1,38 @@ +# Template file for 'python-tweepy' +pkgname=python-tweepy +_pypiname=tweepy +version=3.5.0 +revision=1 +wrksrc="${pkgname#*-}-${version}" +build_style=python-module +hostmakedepends="python-setuptools python3-setuptools python-pip python3-pip" +depends="python-requests python-requests-oauthlib python-six" +short_desc="Twitter library for python" +maintainer="maxice8 " +license="MIT" +homepage="https://pypy.python.org/pypi/tweepy/3.5.0" +distfiles="${PYPI_SITE}/t/tweepy/tweepy-${version}.tar.gz https://raw.githubusercontent.com/tweepy/tweepy/920f5c49c059c4ea7f16c7c4f070c484161525c3/LICENSE>LICENSE.txt" +checksum="f00ccf5f48c30d559ce0b750dfe3b2df6668dc799d8ce276fd90bfaa68845a58 + deeeae0dcc22dbf108a801b8dc4e484bcc1bfb541b1a4f4615ab3e61def44fb5" +noarch=yes + +post_install() { + vlicense ../LICENSE.txt +} + +python3-tweepy_package() { + noarch=yes + depends="python3" + replaces="python3.4-tweepy>=0" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + vlicense ../LICENSE.txt + } +} +python3.4-tweepy_package() { + noarch=yes + build_style=meta + short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)" + depends="python3-tweepy>=${version}_${revision}" +} diff --git a/srcpkgs/python3-async-timeout/template b/srcpkgs/python3-async-timeout/template index 87518201154..a4bd617a404 100644 --- a/srcpkgs/python3-async-timeout/template +++ b/srcpkgs/python3-async-timeout/template @@ -1,6 +1,6 @@ # Template file for 'python3-async-timeout' pkgname=python3-async-timeout -version=1.4.0 +version=2.0.0 revision=1 noarch=yes wrksrc="async-timeout-${version}" @@ -13,4 +13,4 @@ maintainer="Michael Aldridge " license="Apache-2.0" homepage="https://github.com/aio-libs/async-timeout" distfiles="https://github.com/aio-libs/async-timeout/archive/v${version}.tar.gz" -checksum=627366ef67f2a5dcab7e7d672794db3c70bddaac13d200a21883c37578b85221 +checksum=6209cdbaacdd592978f53e4c9466a423e72f26c226a15d0d46791f856aca1a0f diff --git a/srcpkgs/python3-gnupg b/srcpkgs/python3-gnupg new file mode 120000 index 00000000000..03e85363c37 --- /dev/null +++ b/srcpkgs/python3-gnupg @@ -0,0 +1 @@ +python-gnupg \ No newline at end of file diff --git a/srcpkgs/python3-jmespath b/srcpkgs/python3-jmespath new file mode 120000 index 00000000000..a0dad3f3662 --- /dev/null +++ b/srcpkgs/python3-jmespath @@ -0,0 +1 @@ +python-jmespath \ No newline at end of file diff --git a/srcpkgs/python3-kitchen b/srcpkgs/python3-kitchen new file mode 120000 index 00000000000..39c60205412 --- /dev/null +++ b/srcpkgs/python3-kitchen @@ -0,0 +1 @@ +python-kitchen \ No newline at end of file diff --git a/srcpkgs/python3-multidict/template b/srcpkgs/python3-multidict/template index f6ea0410796..6fa7a477e49 100644 --- a/srcpkgs/python3-multidict/template +++ b/srcpkgs/python3-multidict/template @@ -1,7 +1,7 @@ # Template file for 'python3-multidict' pkgname=python3-multidict -version=3.2.0 -revision=1 +version=3.3.0 +revision=2 wrksrc="multidict-${version}" build_style=python3-module pycompile_module="multidict" @@ -12,4 +12,4 @@ maintainer="Michael Aldridge " license="Apache-2.0" homepage="https://github.com/aio-libs/multidict" distfiles="https://github.com/aio-libs/multidict/archive/v${version}.tar.gz" -checksum=cefa2da44fea2248c967a2de5ac4cb5a17dfe23a19118c40bf99204b3fb848b7 +checksum=207977435fec18a9435774db90f35fb1c82af9fe76b29f89770642c6f99bd3fc diff --git a/srcpkgs/python3-tweepy b/srcpkgs/python3-tweepy new file mode 120000 index 00000000000..ff8b473eef2 --- /dev/null +++ b/srcpkgs/python3-tweepy @@ -0,0 +1 @@ +python-tweepy \ No newline at end of file diff --git a/srcpkgs/python3.4-tweepy b/srcpkgs/python3.4-tweepy new file mode 120000 index 00000000000..ff8b473eef2 --- /dev/null +++ b/srcpkgs/python3.4-tweepy @@ -0,0 +1 @@ +python-tweepy \ No newline at end of file diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template index d0d6be6f3e6..b5095337dad 100644 --- a/srcpkgs/qemu/template +++ b/srcpkgs/qemu/template @@ -1,7 +1,7 @@ # Template file for 'qemu' pkgname=qemu version=2.10.1 -revision=1 +revision=2 short_desc="Open Source Processor Emulator" maintainer="Juan RP " homepage="http://qemu.org" diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template index b6dceaeb607..e6232075c64 100644 --- a/srcpkgs/qpdf/template +++ b/srcpkgs/qpdf/template @@ -1,16 +1,16 @@ # Template file for 'qpdf' pkgname=qpdf -version=6.0.0 -revision=2 +version=7.0.0 +revision=1 build_style=gnu-configure hostmakedepends="perl" -makedepends="pcre-devel" +makedepends="pcre-devel libjpeg-turbo-devel" short_desc="A Content-Preserving PDF Transformation System" maintainer="Juan RP " license="Artistic-2.0" homepage="http://qpdf.sourceforget.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=a9fdc7e94d38fcd3831f37b6e0fe36492bf79aa6d54f8f66062cf7f9c4155233 +checksum=fed08de14caad0fe5efd148d9eca886d812588b2cbb35d13e61993ee8eb8c65f post_install() { vlicense Artistic-2.0 diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template index 6d197c61902..58739cf799a 100644 --- a/srcpkgs/qutebrowser/template +++ b/srcpkgs/qutebrowser/template @@ -1,6 +1,6 @@ # Template file for 'qutebrowser' pkgname=qutebrowser -version=1.0.0 +version=1.0.2 revision=1 noarch=yes build_style=python3-module @@ -8,13 +8,13 @@ pycompile_module="${pkgname}" hostmakedepends="python3-setuptools asciidoc" depends="python3-setuptools python3-PyQt5-webengine python3-PyQt5-quick python3-Jinja2 python3-Pygments python3-pyPEG2 python3-yaml python3-attrs - python3-PyQt5-opengl python3-PyQt5-sql qt5-plugin-sqlite" + python3-PyQt5-opengl python3-PyQt5-sql qt5-plugin-sqlite dbus" short_desc="Keyboard-focused browser with a minimal GUI" maintainer="Eivind Uggedal " license="GPL-3" homepage="https://qutebrowser.org/" distfiles="https://github.com/The-Compiler/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz" -checksum=f7ffed98556d4d7ef130411c3f3330efe4f1ba2fc573f4a24f02be255bf048a2 +checksum=f33281bd6d23bdfad7fbf8b85a01ae9cbc6bd343a957bbebcdd38f9ee8ae7624 pre_build() { a2x -f manpage doc/${pkgname}.1.asciidoc diff --git a/srcpkgs/rednotebook/template b/srcpkgs/rednotebook/template index 7248fb95d20..aba76773996 100644 --- a/srcpkgs/rednotebook/template +++ b/srcpkgs/rednotebook/template @@ -1,6 +1,6 @@ # Template file for 'rednotebook' pkgname=rednotebook -version=2.2 +version=2.3 revision=1 noarch=yes build_style=python3-module @@ -13,4 +13,4 @@ short_desc="Cross-platform, modern desktop journal" homepage="http://rednotebook.sourceforge.net" license="GPL-3" distfiles="https://github.com/jendrikseipp/rednotebook/archive/v${version}.tar.gz" -checksum=4c459b787a2f95577ff94369f82f54ee8b46f0f9fea4d1be27167191e3b21ac7 +checksum=9db863fc27ef17f8e4d3ce3cd96af1e62d33aa7bf1eb229f708f1fd5ccc2eb22 diff --git a/srcpkgs/rest/template b/srcpkgs/rest/template index 9f0a1f6343e..c91d0d6dcae 100644 --- a/srcpkgs/rest/template +++ b/srcpkgs/rest/template @@ -1,6 +1,6 @@ # Template file for 'rest' pkgname=rest -version=0.8.0 +version=0.8.1 revision=1 build_style=gnu-configure configure_args="$(vopt_enable gir introspection) --disable-static @@ -13,7 +13,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=e7b89b200c1417073aef739e8a27ff2ab578056c27796ec74f5886a5e0dff647 +checksum=0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9 # Package build options build_options="gir" diff --git a/srcpkgs/rofi-pass/template b/srcpkgs/rofi-pass/template new file mode 100644 index 00000000000..71f98b7942f --- /dev/null +++ b/srcpkgs/rofi-pass/template @@ -0,0 +1,12 @@ +# Template file for 'rofi-pass' +pkgname=rofi-pass +version=1.5.0 +revision=1 +build_style=gnu-makefile +depends="bash pass sed rofi gawk xdotool" +short_desc="Rofi frontend for pass" +maintainer="Yuusha Spacewolf " +license="GPL-3" +homepage="https://github.com/carnager/rofi-pass" +distfiles="https://github.com/carnager/${pkgname}/archive/${version}.tar.gz" +checksum=175b33cd098968a34e0ac5aa8195c1155e8263b2c56c1c9bc65bff27e961e827 diff --git a/srcpkgs/rofi/template b/srcpkgs/rofi/template index 2cc953d9397..ab558d44854 100644 --- a/srcpkgs/rofi/template +++ b/srcpkgs/rofi/template @@ -1,6 +1,6 @@ # Template file for 'rofi' pkgname=rofi -version=1.4.1 +version=1.4.2 revision=1 build_style=gnu-configure hostmakedepends="pkg-config bison flex" @@ -12,7 +12,7 @@ maintainer="Dave Davenport " license="MIT" homepage="https://davedavenport.github.io/rofi/" distfiles="https://github.com/DaveDavenport/rofi/releases/download/${version}/rofi-${version}.tar.xz" -checksum=90fbca9b4b4bc4eaf55a8d5115e880611137faaa44b0d929694cb40ef9face76 +checksum=1a8df8c84316ac0c2b1e9985b346875d8ae4142cbec83f9961a63c73de624984 post_install() { vlicense COPYING diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template index 7be6bc56681..993f35f29b6 100644 --- a/srcpkgs/rpi-kernel/template +++ b/srcpkgs/rpi-kernel/template @@ -1,10 +1,10 @@ # Template file for 'rpi-kernel' # -_githash="31f8c0c3f269675085e1271c9d3f76c42e672594" +_githash="6f54be87ea3626536a446e14bdbad9cffd650e1a" _gitshort="${_githash:0:7}" pkgname=rpi-kernel -version=4.9.51 +version=4.9.56 revision=1 wrksrc="linux-${_githash}" maintainer="Juan RP " @@ -12,7 +12,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel for Raspberry Pi (${version%.*} series [git ${_gitshort}])" distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz" -checksum=5e93e7941c88c3f935898930dcfd546a7b2a7113dc53ec1835b8c8540b6e8fa5 +checksum=4b408dfce16489c58147439602a69e059d36d507f908f7f91a7f4a4c6b0586dc _kernver="${version}_${revision}" diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template new file mode 100644 index 00000000000..67dfed4a205 --- /dev/null +++ b/srcpkgs/rssguard/template @@ -0,0 +1,23 @@ +# Template file for 'rssguard' +pkgname=rssguard +version=3.5.0 +revision=1 +build_style=qmake +configure_args="CONFIG+=release LRELEASE_EXECUTABLE=lrelease-qt5" +makedepends="qt5-tools-devel" +depends="desktop-file-utils" +maintainer="cr6git " +short_desc="Simple (yet powerful) Qt5 feed reader" +homepage="https://github.com/martinrotter/rssguard" +license="GPL-3" +distfiles="https://github.com/martinrotter/rssguard/archive/${version}.tar.gz" +checksum=b89c909fef98892641671fcd79b1374a3d6cfba4fb52e6e6a1e4250c10693d1b + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-tools-devel" +fi + +post_install() { + # Install rssguard icon manually + vinstall resources/graphics/rssguard.png 644 usr/share/pixmaps +} diff --git a/srcpkgs/rtmidi/patches/fix-cross.patch b/srcpkgs/rtmidi/patches/fix-cross.patch new file mode 100644 index 00000000000..0c7acdda8ac --- /dev/null +++ b/srcpkgs/rtmidi/patches/fix-cross.patch @@ -0,0 +1,21 @@ +--- configure.ac.orig 2017-10-11 07:45:18.000000000 +0000 ++++ configure.ac 2017-10-11 07:49:25.955714462 +0000 +@@ -30,12 +30,12 @@ + + # Check version number coherency between RtMidi.h and configure.ac + AC_MSG_CHECKING([that version numbers are coherent]) +-AC_RUN_IFELSE( +- [AC_LANG_PROGRAM([#include +- `grep "define RTMIDI_VERSION" $srcdir/RtMidi.h`], +- [return strcmp(RTMIDI_VERSION, PACKAGE_VERSION);])], +- [AC_MSG_RESULT([yes])], +- [AC_MSG_FAILURE([testing RTMIDI_VERSION==PACKAGE_VERSION failed, check that RtMidi.h defines RTMIDI_VERSION as "$PACKAGE_VERSION" or that the first line of configure.ac has been updated.])]) ++# AC_RUN_IFELSE( ++# [AC_LANG_PROGRAM([#include ++# `grep "define RTMIDI_VERSION" $srcdir/RtMidi.h`], ++# [return strcmp(RTMIDI_VERSION, PACKAGE_VERSION);])], ++# [AC_MSG_RESULT([yes])], ++# [AC_MSG_FAILURE([testing RTMIDI_VERSION==PACKAGE_VERSION failed, check that RtMidi.h defines RTMIDI_VERSION as "$PACKAGE_VERSION" or that the first line of configure.ac has been updated.])]) + + # Enable some nice automake features if they are available + m4_ifdef([AM_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) diff --git a/srcpkgs/rtmidi/template b/srcpkgs/rtmidi/template index 544d0c3795b..310939472a9 100644 --- a/srcpkgs/rtmidi/template +++ b/srcpkgs/rtmidi/template @@ -13,13 +13,16 @@ homepage="http://www.music.mcgill.ca/~gary/rtmidi/" distfiles="https://github.com/thestk/rtmidi/archive/v${version}.tar.gz" checksum=55cd0fba60321aadcd847481d207bf2b70e783b5bfa1a01037bf916554a7d5c4 -nocross="https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/4371/steps/shell_3/logs/stdio" - pre_configure() { sed -i 's/\($cppflag\)/\1 $CFLAGS/' configure.ac + sed -n '/Copyright (c)/,$ p' < README.md > LICENSE autoreconf -fi } +post_install() { + vlicense LICENSE +} + rtmidi-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/rtv/template b/srcpkgs/rtv/template new file mode 100644 index 00000000000..957cb34240a --- /dev/null +++ b/srcpkgs/rtv/template @@ -0,0 +1,19 @@ +# Template file for 'rtv' +pkgname=rtv +version=1.18.0 +revision=1 +noarch=yes +build_style=python3-module +pycompile_module="rtv" +hostmakedepends="python3-setuptools" +depends="ncurses python3-BeautifulSoup4 python3-decorator python3-kitchen python3-requests python3-six" +short_desc="A simple terminal viewer for Reddit (Reddit Terminal Viewer)" +maintainer="dleeram " +license="MIT" +homepage="https://github.com/michael-lazar/${pkgname}" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=44e49253db01bcda5992b80804444c6e996092146c5176a7f44ca1a1f1abe815 + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/rust/patches/link-musl-dynamically.patch b/srcpkgs/rust/patches/link-musl-dynamically.patch index dfd56686f41..526a615da58 100644 --- a/srcpkgs/rust/patches/link-musl-dynamically.patch +++ b/srcpkgs/rust/patches/link-musl-dynamically.patch @@ -1,16 +1,52 @@ ---- a/src/bootstrap/sanity.rs -+++ b/src/bootstrap/sanity.rs -@@ -21,3 +21,2 @@ - use std::ffi::{OsStr, OsString}; +--- rustc-1.21.0-src/src/liblibc/src/unix/mod.rs.orig ++++ rustc-1.21.0-src/src/liblibc/src/unix/mod.rs +@@ -228,10 +228,6 @@ + } else if #[cfg(feature = "use_std")] { + // cargo build, don't pull in anything extra as the libstd dep + // already pulls in all libs. +- } else if #[cfg(any(all(target_env = "musl", not(target_arch = "mips"))))] { +- #[link(name = "c", kind = "static", cfg(target_feature = "crt-static"))] +- #[link(name = "c", cfg(not(target_feature = "crt-static")))] +- extern {} + } else if #[cfg(target_os = "emscripten")] { + #[link(name = "c")] + extern {} +--- rustc-1.21.0-src/src/bootstrap/compile.rs.orig ++++ rustc-1.21.0-src/src/bootstrap/compile.rs +@@ -127,9 +127,6 @@ + fn copy_musl_third_party_objects(build: &Build, + target: Interned, + into: &Path) { +- for &obj in &["crt1.o", "crti.o", "crtn.o"] { +- copy(&build.musl_root(target).unwrap().join("lib").join(obj), &into.join(obj)); +- } + } + + /// Configure cargo to compile the standard library, adding appropriate env vars +--- rustc-1.21.0-src/src/bootstrap/sanity.rs.orig ++++ rustc-1.21.0-src/src/bootstrap/sanity.rs +@@ -21,7 +21,6 @@ + use std::collections::HashMap; + use std::env; + use std::ffi::{OsString, OsStr}; -use std::fs; use std::process::Command; -@@ -132,27 +132,6 @@ - panic!("the iOS target is only supported on OSX"); + use std::path::PathBuf; + +@@ -168,34 +167,6 @@ + panic!("the iOS target is only supported on macOS"); } -- // Make sure musl-root is valid if specified +- // Make sure musl-root is valid - if target.contains("musl") && !target.contains("mips") { -- match build.musl_root(target) { +- // If this is a native target (host is also musl) and no musl-root is given, +- // fall back to the system toolchain in /usr before giving up +- if build.musl_root(*target).is_none() && build.config.build == *target { +- let target = build.config.target_config.entry(target.clone()) +- .or_insert(Default::default()); +- target.musl_root = Some("/usr".into()); +- } +- match build.musl_root(*target) { - Some(root) => { - if fs::metadata(root.join("lib/libc.a")).is_err() { - panic!("couldn't find libc.a in musl dir: {}", @@ -32,69 +68,99 @@ if target.contains("msvc") { // There are three builds of cmake on windows: MSVC, MinGW, and // Cygwin. The Cygwin build does not have generators for Visual ---- a/src/liblibc/src/unix/mod.rs -+++ b/src/liblibc/src/unix/mod.rs -@@ -209,10 +209,6 @@ - } else if #[cfg(all(not(stdbuild), feature = "use_std"))] { - // cargo build, don't pull in anything extra as the libstd dep - // already pulls in all libs. -- } else if #[cfg(any(all(target_env = "musl", not(target_arch = "mips"))))] { -- #[link(name = "c", kind = "static", cfg(target_feature = "crt-static"))] -- #[link(name = "c", cfg(not(target_feature = "crt-static")))] -- extern {} - } else if #[cfg(target_os = "emscripten")] { - #[link(name = "c")] - extern {} ---- a/src/librustc_back/target/x86_64_unknown_linux_musl.rs -+++ b/src/librustc_back/target/x86_64_unknown_linux_musl.rs -@@ -11,7 +11,7 @@ +--- rustc-1.21.0-src/src/librustc_back/target/x86_64_unknown_linux_musl.rs.orig ++++ rustc-1.21.0-src/src/librustc_back/target/x86_64_unknown_linux_musl.rs +@@ -12,7 +12,7 @@ use target::{Target, TargetResult}; - + pub fn target() -> TargetResult { - let mut base = super::linux_musl_base::opts(); + let mut base = super::linux_base::opts(); base.cpu = "x86-64".to_string(); - base.max_atomic_width = 64; - base.pre_link_args.push("-m64".to_string()); ---- a/src/libunwind/build.rs -+++ b/src/libunwind/build.rs -@@ -16,9 +16,7 @@ - let target = env::var("TARGET").unwrap(); - + base.max_atomic_width = Some(64); + base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m64".to_string()); +--- rustc-1.21.0-src/src/libunwind/build.rs.orig ++++ rustc-1.21.0-src/src/libunwind/build.rs +@@ -15,9 +15,7 @@ + let target = env::var("TARGET").expect("TARGET was not set"); + if target.contains("linux") { - if target.contains("musl") && !target.contains("mips") { -- println!("cargo:rustc-link-lib=static=unwind"); +- // musl is handled in lib.rs - } else if !target.contains("android") { + if !target.contains("android") { println!("cargo:rustc-link-lib=gcc_s"); } } else if target.contains("freebsd") { ---- rustc-1.19.0-src/src/bootstrap/compile.rs.orig -+++ rustc-1.19.0-src/src/bootstrap/compile.rs -@@ -114,10 +114,6 @@ - let libdir = build.sysroot_libdir(target_compiler, target); - add_to_sysroot(&libdir, &libstd_stamp(build, compiler, target)); +--- rustc-1.21.0-src/src/libunwind/lib.rs.orig ++++ rustc-1.21.0-src/src/libunwind/lib.rs +@@ -28,7 +28,3 @@ + #[cfg(not(target_env = "msvc"))] + pub use libunwind::*; -- if target.contains("musl") && !target.contains("mips") { -- copy_musl_third_party_objects(build, target, &libdir); -- } -- - if build.config.sanitizers && compiler.stage != 0 && target == "x86_64-apple-darwin" { - // The sanitizers are only built in stage1 or above, so the dylibs will - // be missing in stage0 and causes panic. See the `std()` function above -@@ -126,15 +122,6 @@ +-#[cfg(all(target_env = "musl", not(target_arch = "mips")))] +-#[link(name = "unwind", kind = "static", cfg(target_feature = "crt-static"))] +-#[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))] +-extern {} +--- rustc-1.21.0-src/src/bootstrap/compile.rs.orig ++++ rustc-1.21.0-src/src/bootstrap/compile.rs +@@ -82,7 +82,6 @@ + // still contain the musl startup objects. + if target.contains("musl") && !target.contains("mips") { + let libdir = builder.sysroot_libdir(compiler, target); +- copy_musl_third_party_objects(build, target, &libdir); + } + + builder.ensure(StdLink { +@@ -99,7 +98,6 @@ + + if target.contains("musl") && !target.contains("mips") { + let libdir = builder.sysroot_libdir(compiler, target); +- copy_musl_third_party_objects(build, target, &libdir); + } + + let out_dir = build.cargo_out(compiler, Mode::Libstd, target); +@@ -118,17 +116,6 @@ } } -/// Copies the crt(1,i,n).o startup objects -/// --/// Only required for musl targets that statically link to libc --fn copy_musl_third_party_objects(build: &Build, target: &str, into: &Path) { -- for &obj in &["crt1.o", "crti.o", "crtn.o"] { -- copy(&build.musl_root(target).unwrap().join("lib").join(obj), &into.join(obj)); -- } +-/// Since musl supports fully static linking, we can cross link for it even +-/// with a glibc-targeting toolchain, given we have the appropriate startup +-/// files. As those shipped with glibc won't work, copy the ones provided by +-/// musl so we have them on linux-gnu hosts. +-fn copy_musl_third_party_objects(build: &Build, +- target: Interned, +- into: &Path) { -} - - fn copy_apple_sanitizer_dylibs(native_dir: &Path, platform: &str, into: &Path) { - for &sanitizer in &["asan", "tsan"] { - let filename = format!("libclang_rt.{}_{}_dynamic.dylib", sanitizer, platform); + /// Configure cargo to compile the standard library, adding appropriate env vars + /// and such. + pub fn std_cargo(build: &Build, +--- rustc-1.21.0-src/src/bootstrap/compile.rs.orig ++++ rustc-1.21.0-src/src/bootstrap/compile.rs +@@ -78,12 +78,6 @@ + }); + println!("Uplifting stage1 std ({} -> {})", from.host, target); + +- // Even if we're not building std this stage, the new sysroot must +- // still contain the musl startup objects. +- if target.contains("musl") && !target.contains("mips") { +- let libdir = builder.sysroot_libdir(compiler, target); +- } +- + builder.ensure(StdLink { + compiler: from, + target_compiler: compiler, +@@ -96,10 +90,6 @@ + println!("Building stage{} std artifacts ({} -> {})", compiler.stage, + &compiler.host, target); + +- if target.contains("musl") && !target.contains("mips") { +- let libdir = builder.sysroot_libdir(compiler, target); +- } +- + let out_dir = build.cargo_out(compiler, Mode::Libstd, target); + build.clear_if_dirty(&out_dir, &builder.rustc(compiler)); + let mut cargo = builder.cargo(compiler, Mode::Libstd, target, "build"); diff --git a/srcpkgs/rust/patches/llvm-with-ffi.patch b/srcpkgs/rust/patches/llvm-with-ffi.patch index 22ba1eb7615..42e1b5fea20 100644 --- a/srcpkgs/rust/patches/llvm-with-ffi.patch +++ b/srcpkgs/rust/patches/llvm-with-ffi.patch @@ -1,9 +1,9 @@ ---- rustc-1.12.0/src/librustc_llvm/lib.rs.orig -+++ rustc-1.12.0/src/librustc_llvm/lib.rs -@@ -481,3 +481,6 @@ - mod llvmdeps { - include! { env!("CFG_LLVM_LINKAGE_FILE") } +--- rustc-1.21.0-src/src/librustc_llvm/lib.rs.orig ++++ rustc-1.21.0-src/src/librustc_llvm/lib.rs +@@ -425,3 +425,6 @@ + } + } } + -+#[link(name = "ffi")] -+extern {} ++#[link(name = "ffi")] ++extern {} diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index aca8d9ccff0..48d77e8a6e2 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -1,6 +1,6 @@ # Template file for 'rust' pkgname=rust -version=1.20.0 +version=1.21.0 revision=1 # NB. if you push any(!) new version, don't forget to put a build # output of musl to https://repo.voidlinux.eu/distfiles/ @@ -17,40 +17,40 @@ maintainer="Leah Neukirchen " homepage="http://www.rust-lang.org/" license="MIT, Apache-2.0" distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz" -checksum=2aa4875ff4472c6e35262bbb9052cb2623da3dae6084a858cc59d36f33f18214 +checksum=1707c142244b5bd909993559c6116c81987c1de21d6207c05d3ecbe5bba548fa case "$XBPS_MACHINE" in x86_64-musl) hostmakedepends+=" libcurl libgit2" distfiles+=" - https://repo.voidlinux.eu/distfiles/rustc-1.19.0-x86_64-unknown-linux-musl.tar.gz - https://repo.voidlinux.eu/distfiles/rust-std-1.19.0-x86_64-unknown-linux-musl.tar.gz + https://repo.voidlinux.eu/distfiles/rustc-1.20.0-x86_64-unknown-linux-musl.tar.gz + https://repo.voidlinux.eu/distfiles/rust-std-1.20.0-x86_64-unknown-linux-musl.tar.gz https://repo.voidlinux.eu/distfiles/cargo-0.18.0-x86_64-unknown-linux-musl.tar.gz" checksum+=" - 28aa0f1335fad547072602520a773d29000785aceaed9ec71b1b207256b31d1f - 4e9e92c56708cccc5f567058b21bc62cb0a40bf2ed38466f0dc28eac64aae7d2 + 34b84dc375ef8fb9261762e548b49c4e4c652b5cf3696e6a41a110512c3f2471 + a5b14cf320e3ead97b2afdd9b5df21fa05515ff5d52d19fc7691b377ad6cc968 28f2ee839f14f8b3edf3f4e4cc8600ac99ea50905ee8fb91116bba676728c2e9" ;; x86_64) # extract from src/stage0.txt distfiles+=" - https://static.rust-lang.org/dist/2017-07-20/rustc-1.19.0-x86_64-unknown-linux-gnu.tar.gz - https://static.rust-lang.org/dist/2017-07-20/rust-std-1.19.0-x86_64-unknown-linux-gnu.tar.gz + https://static.rust-lang.org/dist/2017-08-31/rustc-1.20.0-x86_64-unknown-linux-gnu.tar.gz + https://static.rust-lang.org/dist/2017-08-31/rust-std-1.20.0-x86_64-unknown-linux-gnu.tar.gz https://s3.amazonaws.com/rust-lang-ci/cargo-builds/6b05583d71f982bcad049b9fa094c637c062e751/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz" checksum+=" - 4c8df3088d17c8e06bf58d453d39bd521487defcefc8193203b80f0fb797d6fe - 5905803e8a127f656bf253978692f0d6cf6c9206c527e4d6d7e981980618d1b6 + 000e776431718a32b5d40c4aa6e09b3425f0b71dea8c95e718d29b8c0f5b35d3 + a1b3e13b9d6f9aa713783145cb83070b1dabbe17349043b3528031d7712ca929 d9e69d2b87dc0cf7fafe0e0eb64f82fe3414ef14fcb27f5eeff34df860e459d9" ;; i686) # extract from src/stage0.txt distfiles+=" - https://static.rust-lang.org/dist/2017-07-20/rustc-1.19.0-i686-unknown-linux-gnu.tar.gz - https://static.rust-lang.org/dist/2017-07-20/rust-std-1.19.0-i686-unknown-linux-gnu.tar.gz + https://static.rust-lang.org/dist/2017-08-31/rustc-1.20.0-i686-unknown-linux-gnu.tar.gz + https://static.rust-lang.org/dist/2017-08-31/rust-std-1.20.0-i686-unknown-linux-gnu.tar.gz https://s3.amazonaws.com/rust-lang-ci/cargo-builds/6b05583d71f982bcad049b9fa094c637c062e751/cargo-nightly-i686-unknown-linux-gnu.tar.gz" checksum+=" - 33377c93d8afc08f3f211adcfb88b0e9bb0fba5af2ee52016293921c14aa355c - 7cdc76ef163050e9bc352d0ffc48d7d40ae66be0eb1fa1295e0635665c6e32ef + f8ee3a910df757b071472146f7c9ed70b0990f20e7a623cf16c8ada4f6e4e620 + f18fbdc7217f9b014a823c7308407ef30610ebf32f76d879bfa3e3f6937079df 863a4f92bbeec76257403fd571a90b90bd759ec8bcaddb7517fb89d40959e9e5" ;; esac @@ -111,6 +111,7 @@ do_configure() { --build=${_triplet} --release-channel=stable --disable-rpath + --disable-docs --enable-ccache --llvm-root=/usr --enable-local-rust @@ -128,7 +129,6 @@ do_install() { vmkdir usr tar xf build/dist/rustc-*-*-*.tar.gz -C "$DESTDIR/usr" --strip-components=2 --exclude=manifest.in tar xf build/dist/rust-std-*-*-*.tar.gz -C "$DESTDIR/usr/lib" --strip-components=3 --exclude=manifest.in - tar xf build/dist/rust-docs-*-*-*.tar.gz -C "$DESTDIR/usr" --strip-components=2 --exclude=manifest.in vlicense COPYRIGHT vlicense LICENSE-APACHE diff --git a/srcpkgs/sanoid/INSTALL.msg b/srcpkgs/sanoid/INSTALL.msg new file mode 100644 index 00000000000..333e49962ae --- /dev/null +++ b/srcpkgs/sanoid/INSTALL.msg @@ -0,0 +1 @@ +Syncoid has additional functionality when ssh, pv, gzip, lzop, and mbuffer are installed. diff --git a/srcpkgs/sanoid/template b/srcpkgs/sanoid/template new file mode 100644 index 00000000000..5e2fd145d6d --- /dev/null +++ b/srcpkgs/sanoid/template @@ -0,0 +1,22 @@ +# Template file for 'sanoid' +pkgname=sanoid +version=1.4.14 +revision=1 +depends="perl perl-Config-IniFiles" +short_desc="Policy-driven snapshot management tool for ZFS filesystems" +maintainer="Benjamin Slade " +license="GPL-3" +homepage="http://www.openoid.net/products/" +distfiles="https://github.com/jimsalterjrs/sanoid/archive/v$version.tar.gz" +conf_files="/etc/sanoid/sanoid.conf /etc/sanoid/sanoid.defaults.conf" +checksum=7425e54622f7f270d9a5c3ac4e814e20d2df5307b5e032feb4a6d023a659d516 + +do_install() { + vlicense LICENSE + vdoc README.md + vinstall sanoid.conf 644 etc/sanoid/ + vinstall sanoid.defaults.conf 644 etc/sanoid/ + vbin sanoid + vbin syncoid + vbin findoid +} diff --git a/srcpkgs/scanmem/template b/srcpkgs/scanmem/template index 6a5120bf6b7..2fa949d3354 100644 --- a/srcpkgs/scanmem/template +++ b/srcpkgs/scanmem/template @@ -1,6 +1,6 @@ # Template file for 'scanmem' pkgname=scanmem -version=0.16.1 +version=0.17 revision=1 build_style=gnu-configure hostmakedepends="libtool intltool m4 automake python" @@ -11,10 +11,16 @@ maintainer="Andrea Brancaleoni " license="GPL-3" homepage="https://github.com/scanmem/scanmem" distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" -checksum=6eb8b843a34ef70f0d8f42f1d3aff779ae4cf7fde468ba4728519f45908b765b +checksum=f02054b91322cf41517506158fcb74554e9fc6644e696f8aa25e5acf162d374b configure_args="--disable-static --enable-gui" CFLAGS="-D__NEED_pid_t" +case "$XBPS_TARGET_MACHINE" in + *-musl) + broken="yes" + ;; +esac + pre_configure() { NOCONFIGURE=1 ./autogen.sh } diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template index 467ee8c5eab..af4abaa3c2e 100644 --- a/srcpkgs/scrypt/template +++ b/srcpkgs/scrypt/template @@ -1,7 +1,7 @@ # Template file for 'scrypt' pkgname=scrypt version=1.2.1 -revision=2 +revision=3 build_style=gnu-configure makedepends="libressl-devel" short_desc="The scrypt key derivation function" @@ -10,3 +10,7 @@ license="2-clause-BSD" homepage="https://www.tarsnap.com/scrypt.html" distfiles="https://www.tarsnap.com/scrypt/scrypt-${version}.tgz" checksum=4621f5e7da2f802e20850436219370092e9fcda93bd598f6d4236cce33f4c577 + +post_install() { + vlicense COPYRIGHT +} diff --git a/srcpkgs/scudcloud/template b/srcpkgs/scudcloud/template new file mode 100644 index 00000000000..afa85da542f --- /dev/null +++ b/srcpkgs/scudcloud/template @@ -0,0 +1,17 @@ +# Template file for 'scudcloud' +pkgname=scudcloud +version=1.62 +revision=1 +makedepends="python3 python3-setuptools python-PyQt5 python-dbus python3-PyQt5-dbus" +short_desc="Non official desktop client app for Slack" +noarch=yes +maintainer="Gurpreet Singh " +license="MIT" +homepage="https://launchpad.net/~rael-gc/+archive/ubuntu/scudcloud" +distfiles="https://github.com/raelgc/${pkgname}/archive/v${version}.tar.gz" +checksum=33b746258bae6606adda8deee8abae18844b5f0370f3915f9ec9bec9097eaa1b + +do_install() { + python3 setup.py install --prefix=/usr --root="/" + vlicense LICENSE +} diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template index 55b0c5a2ff1..8128886791a 100644 --- a/srcpkgs/scummvm/template +++ b/srcpkgs/scummvm/template @@ -1,7 +1,7 @@ # Template file for 'scummvm' pkgname=scummvm version=1.9.0 -revision=1 +revision=2 build_style=configure configure_args="--prefix=/usr --enable-plugins --enable-all-engines" hostmakedepends="pkg-config nasm" @@ -18,12 +18,14 @@ checksum=2417edcb1ad51ca05a817c58aeee610bc6db5442984e8cf28e8a5fd914e8ae05 if [ "$CROSS_BUILD" ]; then configure_args+=" --host=${XBPS_CROSS_TRIPLET} --disable-nasm" CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/SDL" -fi -# Cross for arm* is broken when trying to assemble engines/scumm/smush/codec47ARM.s -case "$XBPS_TARGET_MACHINE" in - arm*) broken="engines/scumm/smush/codec47ARM.s" -esac + pre_configure() { + sed -i -e "s|_ranlib=ranlib|_ranlib=${XBPS_CROSS_TRIPLET}-ranlib|" \ + -e "s|_strip=strip|_strip=${XBPS_CROSS_TRIPLET}-strip|" \ + -e "s|_ar=\"ar cru\"|_ar=\"${XBPS_CROSS_TRIPLET}-ar cru\"|" \ + -e "s|_as=\"as\"|_as=\"${XBPS_CROSS_TRIPLET}-as\"|" configure + } +fi do_install() { vbin scummvm diff --git a/srcpkgs/setroot/template b/srcpkgs/setroot/template new file mode 100644 index 00000000000..854e73abab3 --- /dev/null +++ b/srcpkgs/setroot/template @@ -0,0 +1,20 @@ +# Template file for 'setroot' +pkgname=setroot +version=2.0.1 +revision=1 +build_style=gnu-makefile +build_options="xinerama" +build_options_default="xinerama" +desc_option_xinerama="Multiple monitors support" +make_build_args="xinerama=$(vopt_if xinerama 1 0)" +makedepends="imlib2-devel $(vopt_if xinerama libXinerama-devel)" +short_desc="Simple X background setter" +maintainer="SolitudeSF " +license="GPL-3" +homepage="https://github.com/ttzhou/setroot" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=2cfd43c3cc9bbeae7ab74bb89a72f42b4741b5a6b23588a74b20d38ae1fff810 + +pre_build() { + export CFLAGS="$CFLAGS $LDFLAGS" +} diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template index f01a62b7c8d..2441fca3cc5 100644 --- a/srcpkgs/skype/template +++ b/srcpkgs/skype/template @@ -1,18 +1,18 @@ # Template file for 'skype' # This just repackages the debian package. pkgname=skype -version=5.4.0.1 +version=5.5.0.1 revision=1 only_for_archs="x86_64" repository="nonfree" build_style="fetch" nostrip="yes" -short_desc="Skype for Linux Beta" +short_desc="Skype for Linux" maintainer="Lon Willett " license="skype" homepage="https://www.skype.com" distfiles="https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" -checksum=1f31c0e9379f680f2ae2b4db3789e936627459fe0677306895a7fa096c7db2c5 +checksum=99ed59bfc5521f643071694a23f2387dac016038776d48ab03165c2e35c5c5e4 do_extract() { ar p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/skypeforlinux_${version}_amd64.deb data.tar.xz | tar xJpf - ./usr diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template index 7f28cc2c233..195729262e7 100644 --- a/srcpkgs/slack-desktop/template +++ b/srcpkgs/slack-desktop/template @@ -1,6 +1,6 @@ # Template file for 'slack-desktop' pkgname=slack-desktop -version=2.8.0 +version=2.8.2 revision=1 only_for_archs="x86_64" short_desc="A messaging app for teams" @@ -10,7 +10,7 @@ homepage="https://slack.com/" repository="nonfree" restricted=yes nopie=yes -checksum=15626e80dfef62d9f26d1c46987f4a6b333d722d49513797913e238741c4700a +checksum=75661e19efc7c9760f481a9688e5d6e24a2bdc830bda60ca5ec9876a64fc2f05 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/slack-desktop-${version}-amd64.deb" do_extract() { diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template index bf953c6bb23..b042ab8b9c4 100644 --- a/srcpkgs/smplayer/template +++ b/srcpkgs/smplayer/template @@ -1,6 +1,6 @@ # Template file for 'smplayer' pkgname=smplayer -version=17.10.0 +version=17.10.2 revision=1 build_style=gnu-makefile hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://smplayer.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" -checksum=3d40a999343c647cc758a8d5026be9d355dcc84317700128578e51db9f982375 +checksum=48d2f3b72bb8881a37ab9204329160c3bdfc0bbfff248c6dc9407e2dd35b8396 pre_build() { export QMAKE_OPTS="QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_CFLAGS=\"${CFLAGS}\" \ diff --git a/srcpkgs/soundtouch/template b/srcpkgs/soundtouch/template index c5693522862..97efe04bbb0 100644 --- a/srcpkgs/soundtouch/template +++ b/srcpkgs/soundtouch/template @@ -1,6 +1,6 @@ # Template file for 'soundtouch' pkgname=soundtouch -version=1.9.2 +version=2.0.0 revision=1 wrksrc=${pkgname} build_style=gnu-configure @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="http://www.surina.net/soundtouch" license="LGPL-2.1" distfiles="http://www.surina.net/soundtouch/soundtouch-${version}.tar.gz" -checksum=caeb86511e81420eeb454cb5db53f56d96b8451d37d89af6e55b12eb4da1c513 +checksum=d224f7d1421b5f8e74a74c85741345bd9802618a40ae30ce5b427a5705c89d25 pre_configure() { sed -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' -i configure.ac diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template index 379e2014341..2c43dae3c82 100644 --- a/srcpkgs/sox/template +++ b/srcpkgs/sox/template @@ -1,12 +1,13 @@ # Template file for 'sox' pkgname=sox version=14.4.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-distro=Void" hostmakedepends="pkg-config" makedepends="libsndfile-devel lame-devel libao-devel libmad-devel - libid3tag-devel wavpack-devel opusfile-devel pulseaudio-devel libgomp-devel" + libid3tag-devel wavpack-devel opusfile-devel pulseaudio-devel + libgomp-devel libpng-devel" short_desc="Sound eXchange, the Swiss Army knife of audio manipulation" maintainer="Christian Neukirchen " license="GPL-2, LGPL-2.1" diff --git a/srcpkgs/spacefm-ng/template b/srcpkgs/spacefm-ng/template new file mode 100644 index 00000000000..4c81682b3f9 --- /dev/null +++ b/srcpkgs/spacefm-ng/template @@ -0,0 +1,24 @@ +# Template file for 'spacefm-ng' +pkgname=spacefm-ng +version=1.0.6 +revision=1 +build_options="gtk3" +build_options_default="gtk3" +build_style=gnu-configure +configure_script="./autogen.sh" +conf_files="/etc/spacefm/spacefm.conf" +hostmakedepends="pkg-config intltool automake libtool glib-devel" +makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel) glib-devel startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel" +depends="hicolor-icon-theme desktop-file-utils" +configure_args="$(vopt_with gtk3)" +short_desc="Multi-panel tabbed file manager. Fork by Teklad" +maintainer="SolitudeSF " +license="GPL-3" +homepage="https://github.com/Teklad/spacefm-ng" +conflicts="spacefm" +distfiles="https://github.com/Teklad/spacefm-ng/archive/${version}.tar.gz" +checksum=6818c2d962855503bde1910d7ea2f200fdcab04a6713e1016811b8f73bea0836 + +post_install() { + rm ${DESTDIR}/usr/bin/spacefm-installer +} diff --git a/srcpkgs/speedtest-cli/template b/srcpkgs/speedtest-cli/template index d7733ff24be..b5d8741b2f9 100644 --- a/srcpkgs/speedtest-cli/template +++ b/srcpkgs/speedtest-cli/template @@ -1,7 +1,7 @@ # Template file for 'speedtest-cli' pkgname=speedtest-cli -version=1.0.6 -revision=2 +version=1.0.7 +revision=1 noarch=yes build_style=python3-module pycompile_module="speedtest.py speedtest_cli.py" @@ -12,4 +12,4 @@ maintainer="Aaron Marcher " license="Apache-2.0" homepage="https://github.com/sivel/speedtest-cli" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=9ed312e552929241ed090e0c9370801c348e252af89e498034cf4a1ae2aa8aaa +checksum=3853bb7a3d16f686441d0d10ebbfc1fd49e974ecf17248ce03456ad4ef2478b9 diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template index 75955427f26..b52cf40300f 100644 --- a/srcpkgs/spice/template +++ b/srcpkgs/spice/template @@ -1,6 +1,6 @@ # Template file for 'spice' pkgname=spice -version=0.13.90 +version=0.14.0 revision=1 build_style=gnu-configure configure_args="--disable-tunnel --disable-opengl --enable-smartcard @@ -15,7 +15,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.spice-space.org" distfiles="http://www.spice-space.org/download/releases/spice-${version}.tar.bz2" -checksum=c6293cac25e97001e00538bb368658cd6aba1e7e3fd5e1bfa8c8f237e99bca17 +checksum=3adb9495b51650e5eab53c74dd6a74919af4b339ff21721d9ab2a45b2e3bb848 post_extract() { sed -i 's/armv6hl/arm/g' configure # "detects" cpu from triplet. diff --git a/srcpkgs/sqlcipher/patches/fix-libressl.patch b/srcpkgs/sqlcipher/patches/fix-libressl.patch new file mode 100644 index 00000000000..6b779279fd7 --- /dev/null +++ b/srcpkgs/sqlcipher/patches/fix-libressl.patch @@ -0,0 +1,11 @@ +--- src/crypto_openssl.c ++++ src/crypto_openssl.c +@@ -46,7 +46,7 @@ static unsigned int openssl_external_init = 0; + static unsigned int openssl_init_count = 0; + static sqlite3_mutex* openssl_rand_mutex = NULL; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + static HMAC_CTX *HMAC_CTX_new(void) + { + HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx)); diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template index 4b27a2818a3..88c44557a43 100644 --- a/srcpkgs/sqlcipher/template +++ b/srcpkgs/sqlcipher/template @@ -1,7 +1,7 @@ # Template file for 'sqlcipher' pkgname=sqlcipher -version=3.4.0 -revision=4 +version=3.4.1 +revision=1 build_style=gnu-configure configure_args="--enable-tempstore=yes" hostmakedepends="tcl" @@ -11,7 +11,7 @@ maintainer="Steve Prybylski " license="3-clause-BSD" homepage="https://www.zetetic.net/sqlcipher/" distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" -checksum=99b702ecf796de02bf7b7b35de4ceef145f0d62b4467a86707c2d59beea243d0 +checksum=4172cc6e5a79d36e178d36bd5cc467a938e08368952659bcd95eccbaf0fa4ad4 CFLAGS="-DSQLITE_HAS_CODEC" post_install() { diff --git a/srcpkgs/suricata/template b/srcpkgs/suricata/template index 87496fbe362..c3705423c0c 100644 --- a/srcpkgs/suricata/template +++ b/srcpkgs/suricata/template @@ -1,6 +1,6 @@ # Template file for 'suricata' pkgname=suricata -version=4.0.0 +version=4.0.1 revision=1 build_style=gnu-configure configure_args="--disable-gccmarch-native" @@ -12,8 +12,8 @@ license="GPL-2" homepage="https://suricata-ids.org/" distfiles="https://www.openinfosecfoundation.org/download/$pkgname-$version.tar.gz https://rules.emergingthreats.net/open/suricata/emerging.rules.tar.gz" -checksum="6b8b183a8409829ca92c71854cc1abed45f04ccfb7f14c08211f4edf571fa577 - 02a962878ceb5fdf2bf93e95ab4620a570e8c9353820889855c59717e19f23c4" +checksum="0e73edb2911791644d82a62ab4f75517bbed339c0f21aadc0eb307b313643885 + 0ab36941a9926692987d45386c2933e42b76d5adbb46936dfce27bd378088f57" system_accounts="$pkgname" conf_files="/etc/$pkgname/*.* /etc/$pkgname/rules/*" diff --git a/srcpkgs/sv-helper/template b/srcpkgs/sv-helper/template index b3c081ecaca..ee375a3c521 100644 --- a/srcpkgs/sv-helper/template +++ b/srcpkgs/sv-helper/template @@ -1,6 +1,6 @@ # Template file for 'sv-helper' pkgname=sv-helper -version=2.0.1 +version=2.0.2 revision=1 depends="runit" noarch="yes" @@ -9,7 +9,7 @@ maintainer="bougyman " license="MIT" homepage="https://github.com/rubyists/sv-helper" distfiles="https://github.com/rubyists/sv-helper/archive/${version}.tar.gz" -checksum=97a36e9759c8db3aae07c262b87c0047e18d63897a2e71b0ff8f0f90d35883d5 +checksum=4914a0185502ec0079585533d09fe87938098728bed8b158d40484c58e44f9c7 system_accounts="rsvlog" rsvlog_homedir="/var/log" @@ -23,4 +23,5 @@ do_install() { ln -s sv-helper $DESTDIR/usr/bin/$cmd done vdoc README.md + vlicense COPYING } diff --git a/srcpkgs/svctl/template b/srcpkgs/svctl/template new file mode 100644 index 00000000000..a95f3f62274 --- /dev/null +++ b/srcpkgs/svctl/template @@ -0,0 +1,19 @@ +# Template file for 'svctl' +pkgname=svctl +version=1 +revision=1 +build_style=go +go_import_path="github.com/KenjiTakahashi/svctl" +go_ldflags="-X main.Version=v${version}" +short_desc="Interactive controller for runit" +hostmakedepends="git" +maintainer="maxice8 " +license="MIT" +homepage="https://github.com/KenjiTakahashi/svctl" +distfiles="https://github.com/KenjiTakahashi/svctl/archive/${version}.tar.gz" +checksum=f8011c402de91f57bb2c4c621afa573c3edef35d78bc4ce70786ea10171c8f72 + +post_install() { + vlicense LICENSE.md + vdoc README.md +} diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template index bf271e64dcb..abbde1c5993 100644 --- a/srcpkgs/sway/template +++ b/srcpkgs/sway/template @@ -7,7 +7,7 @@ configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc" hostmakedepends="asciidoc pkg-config wayland-devel" makedepends="libcap-devel wlc-devel gdk-pixbuf-devel json-c-devel pango-devel pam-devel" conf_files="/etc/sway/config /etc/pam.d/swaylock" -short_desc="i3 compatible window manager for Wayland" +short_desc="An i3-compatible window manager for Wayland" maintainer="Juan RP " license="MIT" homepage="http://swaywm.org" diff --git a/srcpkgs/tacacs/template b/srcpkgs/tacacs/template new file mode 100644 index 00000000000..199078ae6d9 --- /dev/null +++ b/srcpkgs/tacacs/template @@ -0,0 +1,19 @@ +# Template file for 'tacacs' +pkgname=tacacs +version=4.0.4.28 +revision=1 +wrksrc=$pkgname-F$version +build_style=gnu-configure +configure_args="--with-libwrap=no" +hostmakedepends="flex perl" +short_desc="Modified version of Cisco's tacacs+ (tac_plus) developer's kit" +maintainer="Renato Aguiar " +license="custom" +homepage="http://www.shrubbery.net/tac_plus/" +distfiles="ftp://ftp.shrubbery.net/pub/tac_plus/$pkgname-F$version.tar.gz" +checksum=147f2dc98d26d2f93f0aba76c988ced196ffe1c001dc2e91f788a1a2c747219e +only_for_archs="x86_64 i686 aarch64 armv7hf" + +post_install() { + vlicense COPYING +} diff --git a/srcpkgs/terminology/template b/srcpkgs/terminology/template index e26772322f0..416a9c48035 100644 --- a/srcpkgs/terminology/template +++ b/srcpkgs/terminology/template @@ -1,7 +1,7 @@ # Template file for 'terminology' pkgname=terminology version=1.1.1 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config efl" makedepends="efl-devel" @@ -12,3 +12,7 @@ maintainer="Juan RP " license="2-clause-BSD" distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.xz" checksum=da12b8a24ca5248b2d292d9b1e19cabc61ae29b21f96d4b6f4f3e7b4feeecc16 + +post_install() { + vlicense COPYING +} diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template index bf59430ebf3..7b4a1b56be6 100644 --- a/srcpkgs/terragrunt/template +++ b/srcpkgs/terragrunt/template @@ -1,6 +1,6 @@ # Template file for 'terragrunt' pkgname=terragrunt -version=0.13.7 +version=0.13.13 revision=1 build_style=go short_desc="A thin wrapper for Terraform that provides extra tools" @@ -11,7 +11,7 @@ license="MIT" go_import_path="github.com/gruntwork-io/$pkgname" homepage="https://$go_import_path" distfiles="$homepage/archive/v$version.tar.gz" -checksum=760738f6a8219fce2451c1590ed93e6f8cb1bfc9610893f82a988ecf1225a83a +checksum=5a459b0eb67754dccbf0af00f11133504625c9e429fb91b337e775ecf666bb79 post_install() { vlicense LICENSE.txt diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template index d83d22e9ca1..2c7cea0496a 100644 --- a/srcpkgs/thefuck/template +++ b/srcpkgs/thefuck/template @@ -1,6 +1,6 @@ # Template file for 'thefuck' pkgname=thefuck -version=3.23 +version=3.24 revision=1 build_style=python3-module pycompile_module="thefuck" @@ -13,7 +13,7 @@ maintainer='Benjamin "Doctors" Hoffmeyer ' license="MIT" homepage="https://github.com/nvbn/thefuck" distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz" -checksum=36b0af52219a56dc34bb085e75afa822c479c5c05b9393598effc2c1b3c5eb32 +checksum=686867f264ee34d9287814dde0e9ca5debb322deeaf0ac6773ec06f823d7c0b4 post_install() { vlicense LICENSE.md diff --git a/srcpkgs/thin-provisioning-tools/patches/0001-fix-build-with-testing-disabled.patch b/srcpkgs/thin-provisioning-tools/patches/0001-fix-build-with-testing-disabled.patch new file mode 100644 index 00000000000..eef7f283577 --- /dev/null +++ b/srcpkgs/thin-provisioning-tools/patches/0001-fix-build-with-testing-disabled.patch @@ -0,0 +1,35 @@ +From 8d75be81120b9cf172c95d0153c5f845ed804234 Mon Sep 17 00:00:00 2001 +From: Adam Sampson +Date: Mon, 16 Oct 2017 13:07:36 +0100 +Subject: [functional-tests] fix build with testing disabled (#88) + +The rule for lib/libft.so is only enabled with --enable-testing, +so the default target shouldn't depend unconditionally on it. +With the default configure options, the build failed with: +make: *** No rule to make target 'lib/libft.so', needed by 'all'. Stop. +--- + Makefile.in | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git Makefile.in.orig Makefile.in +index e745739..02b75dd 100644 +--- Makefile.in.orig ++++ Makefile.in +@@ -21,8 +21,13 @@ V=@ + PROGRAMS=\ + bin/pdata_tools + ++ifeq ("@TESTING@", "yes") ++TESTLIBS=\ ++ lib/libft.so ++endif ++ + .PHONY: all +-all: $(PROGRAMS) lib/libft.so ++all: $(PROGRAMS) $(TESTLIBS) + + SOURCE=\ + base/output_file_requirements.cc \ +-- +cgit v1.1-22-g1649 + diff --git a/srcpkgs/thin-provisioning-tools/template b/srcpkgs/thin-provisioning-tools/template index ef9e64317c6..0099ca13adf 100644 --- a/srcpkgs/thin-provisioning-tools/template +++ b/srcpkgs/thin-provisioning-tools/template @@ -1,6 +1,6 @@ # Template file for 'thin-provisioning-tools' pkgname=thin-provisioning-tools -version=0.7.1 +version=0.7.4 revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="GPL-3" homepage="https://github.com/jthornber/thin-provisioning-tools" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=da45e387bb7ad5b1b8727dc3e013a1136a18fe7a59bea19074a945ff6d73b925 +checksum=f65f84e653e182480dacad77c611e13cd6de1c354e02fb4b96db4d2f328c3904 pre_configure() { autoreconf -fi diff --git a/srcpkgs/thingylaunch/patches/fix-cmake-flags-override.patch b/srcpkgs/thingylaunch/patches/fix-cmake-flags-override.patch new file mode 100644 index 00000000000..023f2b2c00a --- /dev/null +++ b/srcpkgs/thingylaunch/patches/fix-cmake-flags-override.patch @@ -0,0 +1,11 @@ +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -5,8 +5,6 @@ SET (TL_PROJECT_VERS 2.0.3) + + PROJECT (${TL_PROJECT_NAME} CXX C) + +-SET(CMAKE_CXX_FLAGS "-std=c++11") +- + IF (USE_XCB) + # Use libxcb + FIND_PACKAGE (PkgConfig REQUIRED) diff --git a/srcpkgs/thingylaunch/template b/srcpkgs/thingylaunch/template new file mode 100644 index 00000000000..0b9bfded2fd --- /dev/null +++ b/srcpkgs/thingylaunch/template @@ -0,0 +1,18 @@ +# Template file for 'thingylaunch' +pkgname=thingylaunch +version=2.0.3 +revision=1 +build_style=cmake +configure_args="-DUSE_XCB=ON" +hostmakedepends="pkg-config" +makedepends="xcb-util-wm-devel xcb-util-keysyms-devel" +short_desc="X11 application launcher with tab-completion, history, and bookmarks" +maintainer="maxice8 " +license="BSD" +homepage="https://gahr.ch/thingylaunch/" +distfiles="https://github.com/gahr/${pkgname}/archive/${version}.tar.gz" +checksum=4d9cc6b826bddb3d02836f721316bfc24c2b31f75c9c2d5077ae162eb3d60b60 + +post_install() { + vlicense COPYRIGHT +} diff --git a/srcpkgs/thunderbird/patches/fix-cargo.patch b/srcpkgs/thunderbird/patches/fix-cargo.patch new file mode 100644 index 00000000000..687e28d1acc --- /dev/null +++ b/srcpkgs/thunderbird/patches/fix-cargo.patch @@ -0,0 +1,47 @@ +From bbd48a5613c872883616884cfaf41665b0e4ec9b Mon Sep 17 00:00:00 2001 +From: Ralph Giles +Date: Fri, 10 Feb 2017 12:58:18 -0800 +Subject: [PATCH] Bug 1338655 - Don't try to build mp4parse bindings. r=froydnj + +We use the cheddar crate to generate a C header file +for our mp4parse_capi wrapper crate. Currently we +do this at code check-in time via update-rust.sh. + +Cargo 0.18 and later will try to execute a build.rs +file in the crate source tree regardless of whether +it's specified in Cargo.toml so patching out that +line just results in 'crate cheddar not found'. + +This change restores the old behaviour by substituting +a 'build = false' line instead. + +We do have syntex vendored, but we don't currently build +it by default, so I prefer this solution to just vendoring +cheddar and generating the header at build time. The syntex +crate is quite large and adds significantly to our compile +time. + +MozReview-Commit-ID: InJRRODWAdP + +--HG-- +extra : rebase_source : 29378fcbc86015ce6cc22dc66d38a43ddbac204e +--- + media/libstagefright/binding/mp4parse-cargo.patch | 5 +++-- + media/libstagefright/binding/mp4parse_capi/Cargo.toml | 2 ++ + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libstagefright/binding/mp4parse_capi/Cargo.toml +index aee7ee947151a27c..d7e3f55119d3f4b6 100644 +--- mozilla/media/libstagefright/binding/mp4parse_capi/Cargo.toml ++++ mozilla/media/libstagefright/binding/mp4parse_capi/Cargo.toml +@@ -18,6 +18,8 @@ exclude = [ + "*.mp4", + ] + ++build = false ++ + [dependencies] + byteorder = "1.0.0" + "mp4parse" = {version = "0.6.0", path = "../mp4parse"} +-- +2.12.2 diff --git a/srcpkgs/thunderbird/patches/freetype-skia.patch b/srcpkgs/thunderbird/patches/freetype-skia.patch deleted file mode 100644 index 2f573bf79a7..00000000000 --- a/srcpkgs/thunderbird/patches/freetype-skia.patch +++ /dev/null @@ -1,147 +0,0 @@ -# HG changeset patch -# User Lee Salzman -# Date 1504640559 14400 -# Tue Sep 05 15:42:39 2017 -0400 -# Node ID 923246286b9858fb103e100f886c03714b97b5ec -# Parent 3fff2b174212af40a7b7ba75a047db431f81c780 -clip FreeType glyph bitmap to mask in Skia (52 ESR) - -diff --git a/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp b/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp ---- mozilla/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp -+++ mozilla/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp -@@ -350,58 +350,118 @@ void SkScalerContext_FreeType_Base::gene - const SkMatrix& bitmapTransform) - { - const bool doBGR = SkToBool(fRec.fFlags & SkScalerContext::kLCD_BGROrder_Flag); - const bool doVert = SkToBool(fRec.fFlags & SkScalerContext::kLCD_Vertical_Flag); - - switch ( face->glyph->format ) { - case FT_GLYPH_FORMAT_OUTLINE: { - FT_Outline* outline = &face->glyph->outline; -- FT_BBox bbox; -- FT_Bitmap target; - - int dx = 0, dy = 0; - if (fRec.fFlags & SkScalerContext::kSubpixelPositioning_Flag) { - dx = SkFixedToFDot6(glyph.getSubXFixed()); - dy = SkFixedToFDot6(glyph.getSubYFixed()); - // negate dy since freetype-y-goes-up and skia-y-goes-down - dy = -dy; - } -- FT_Outline_Get_CBox(outline, &bbox); -- /* -- what we really want to do for subpixel is -- offset(dx, dy) -- compute_bounds -- offset(bbox & !63) -- but that is two calls to offset, so we do the following, which -- achieves the same thing with only one offset call. -- */ -- FT_Outline_Translate(outline, dx - ((bbox.xMin + dx) & ~63), -- dy - ((bbox.yMin + dy) & ~63)); -+ memset(glyph.fImage, 0, glyph.rowBytes() * glyph.fHeight); - - if (SkMask::kLCD16_Format == glyph.fMaskFormat) { -- FT_Render_Glyph(face->glyph, doVert ? FT_RENDER_MODE_LCD_V : FT_RENDER_MODE_LCD); -+ FT_Outline_Translate(outline, dx, dy); -+ FT_Error err = FT_Render_Glyph(face->glyph, doVert ? FT_RENDER_MODE_LCD_V : FT_RENDER_MODE_LCD); -+ if (err) { -+ return; -+ } -+ - SkMask mask; - glyph.toMask(&mask); -+ -+ FT_GlyphSlotRec& ftGlyph = *face->glyph; -+ -+ if (!SkIRect::Intersects(mask.fBounds, -+ SkIRect::MakeXYWH( ftGlyph.bitmap_left, -+ -ftGlyph.bitmap_top, -+ ftGlyph.bitmap.width, -+ ftGlyph.bitmap.rows))) -+ { -+ return; -+ } -+ -+ // If the FT_Bitmap extent is larger, discard bits of the bitmap outside the mask. -+ // If the SkMask extent is larger, shrink mask to fit bitmap (clearing discarded). -+ unsigned char* origBuffer = ftGlyph.bitmap.buffer; -+ // First align the top left (origin). -+ if (-ftGlyph.bitmap_top < mask.fBounds.fTop) { -+ int32_t topDiff = mask.fBounds.fTop - (-ftGlyph.bitmap_top); -+ ftGlyph.bitmap.buffer += ftGlyph.bitmap.pitch * topDiff; -+ ftGlyph.bitmap.rows -= topDiff; -+ ftGlyph.bitmap_top = -mask.fBounds.fTop; -+ } -+ if (ftGlyph.bitmap_left < mask.fBounds.fLeft) { -+ int32_t leftDiff = mask.fBounds.fLeft - ftGlyph.bitmap_left; -+ ftGlyph.bitmap.buffer += leftDiff; -+ ftGlyph.bitmap.width -= leftDiff; -+ ftGlyph.bitmap_left = mask.fBounds.fLeft; -+ } -+ if (mask.fBounds.fTop < -ftGlyph.bitmap_top) { -+ mask.fImage += mask.fRowBytes * (-ftGlyph.bitmap_top - mask.fBounds.fTop); -+ mask.fBounds.fTop = -ftGlyph.bitmap_top; -+ } -+ if (mask.fBounds.fLeft < ftGlyph.bitmap_left) { -+ mask.fImage += sizeof(uint16_t) * (ftGlyph.bitmap_left - mask.fBounds.fLeft); -+ mask.fBounds.fLeft = ftGlyph.bitmap_left; -+ } -+ // Origins aligned, clean up the width and height. -+ int ftVertScale = (doVert ? 3 : 1); -+ int ftHoriScale = (doVert ? 1 : 3); -+ if (mask.fBounds.height() * ftVertScale < SkToInt(ftGlyph.bitmap.rows)) { -+ ftGlyph.bitmap.rows = mask.fBounds.height() * ftVertScale; -+ } -+ if (mask.fBounds.width() * ftHoriScale < SkToInt(ftGlyph.bitmap.width)) { -+ ftGlyph.bitmap.width = mask.fBounds.width() * ftHoriScale; -+ } -+ if (SkToInt(ftGlyph.bitmap.rows) < mask.fBounds.height() * ftVertScale) { -+ mask.fBounds.fBottom = mask.fBounds.fTop + ftGlyph.bitmap.rows / ftVertScale; -+ } -+ if (SkToInt(ftGlyph.bitmap.width) < mask.fBounds.width() * ftHoriScale) { -+ mask.fBounds.fRight = mask.fBounds.fLeft + ftGlyph.bitmap.width / ftHoriScale; -+ } -+ - if (fPreBlend.isApplicable()) { -- copyFT2LCD16(face->glyph->bitmap, mask, doBGR, -+ copyFT2LCD16(ftGlyph.bitmap, mask, doBGR, - fPreBlend.fR, fPreBlend.fG, fPreBlend.fB); - } else { -- copyFT2LCD16(face->glyph->bitmap, mask, doBGR, -+ copyFT2LCD16(ftGlyph.bitmap, mask, doBGR, - fPreBlend.fR, fPreBlend.fG, fPreBlend.fB); - } -+ // Restore the buffer pointer so FreeType can properly free it. -+ ftGlyph.bitmap.buffer = origBuffer; - } else { -+ FT_BBox bbox; -+ FT_Bitmap target; -+ FT_Outline_Get_CBox(outline, &bbox); -+ /* -+ what we really want to do for subpixel is -+ offset(dx, dy) -+ compute_bounds -+ offset(bbox & !63) -+ but that is two calls to offset, so we do the following, which -+ achieves the same thing with only one offset call. -+ */ -+ FT_Outline_Translate(outline, dx - ((bbox.xMin + dx) & ~63), -+ dy - ((bbox.yMin + dy) & ~63)); -+ - target.width = glyph.fWidth; - target.rows = glyph.fHeight; - target.pitch = glyph.rowBytes(); - target.buffer = reinterpret_cast(glyph.fImage); - target.pixel_mode = compute_pixel_mode( (SkMask::Format)fRec.fMaskFormat); - target.num_grays = 256; - -- memset(glyph.fImage, 0, glyph.rowBytes() * glyph.fHeight); - FT_Outline_Get_Bitmap(face->glyph->library, outline, &target); - } - } break; - - case FT_GLYPH_FORMAT_BITMAP: { - FT_Pixel_Mode pixel_mode = static_cast(face->glyph->bitmap.pixel_mode); - SkMask::Format maskFormat = static_cast(glyph.fMaskFormat); - diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index 9b9c6cd4b9f..43a8f828185 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -1,13 +1,13 @@ # Template build file for 'thunderbird'. pkgname=thunderbird -version=52.3.0 -revision=2 +version=52.4.0 +revision=1 short_desc="Standalone Mail/News reader" maintainer="Enno Boland " homepage="http://www.mozilla.org/thunderbird/" license="MPL-2.0, GPL-2, LGPL-2.1" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=050acc320a9c50365a53e4faa6538a0ad7f9a302d5f2cfb6edf0c6fe1b573b18 +checksum=7f57b5b4d4ec42b04afcff8327abc2d3c6185c0bcc1ad138825d021a2d3f578c only_for_archs="i686 i686-musl x86_64 x86_64-musl" nopie=yes diff --git a/srcpkgs/tokei/template b/srcpkgs/tokei/template index b3d544c41ef..2f35da1de5e 100644 --- a/srcpkgs/tokei/template +++ b/srcpkgs/tokei/template @@ -1,6 +1,6 @@ # Template file for 'tokei' pkgname=tokei -version=6.0.1 +version=6.1.2 revision=1 hostmakedepends="cargo rust" short_desc="Count lines of code" @@ -8,7 +8,7 @@ maintainer="Joseph LaFreniere " license="Apache, MIT" homepage="https://github.com/Aaronepower/tokei" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=f7f455995fa4f14019bb2f3a5203d7b551d8c453e9b7a533de6fa8d707c7fd74 +checksum=736bab89800c397acc3be961af12b80acc2ca71dc990792fff8935018a2f0698 nocross=yes do_build() { diff --git a/srcpkgs/toybox/template b/srcpkgs/toybox/template index 10ee85aa5ce..93ddd2833f0 100644 --- a/srcpkgs/toybox/template +++ b/srcpkgs/toybox/template @@ -1,6 +1,6 @@ # Template file for 'toybox' pkgname=toybox -version=0.7.4 +version=0.7.5 revision=1 create_wrksrc=yes short_desc="BSD-licensed alternative to busybox" @@ -8,7 +8,7 @@ maintainer="Steve Prybylski " license="0BSD" homepage="http://www.landley.net/toybox" distfiles="${homepage}/downloads/${pkgname}-${version}.tar.gz" -checksum=49d74ca897501e5c981516719870fe08581726f5c018abe35ef52c6f0de113e7 +checksum=3ada450ac1eab1dfc352fee915ea6129b9a4349c1885f1394b61bd2d89a46c04 post_extract() { mv toybox-${version} toybox diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template new file mode 100644 index 00000000000..62edef143e9 --- /dev/null +++ b/srcpkgs/tracker-miners/template @@ -0,0 +1,16 @@ +# Template file for 'tracker-miners' +pkgname=tracker-miners +version=2.0.2 +revision=1 +build_style=gnu-configure +configure_args="--enable-libvorbis --enable-libflac" +hostmakedepends="pkg-config glib vala intltool glib-devel" +makedepends="zlib-devel libglib-devel tracker-devel glib-devel libxml2-devel + libseccomp-devel giflib-devel libpng-devel taglib-devel libgsf-devel + libvorbis-devel libflac-devel" +short_desc="Data miners for tracker" +maintainer="Sir_Boops " +license="GPL-2" +homepage="https://developer.gnome.org/libtracker-miner/stable" +distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz" +checksum=cf417ece944c997f630dda41a7f5c449d609fa53dbb34fae7caa4c7af1e0e8ef diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template index c8dc0636bf7..07a9254c872 100644 --- a/srcpkgs/transmission/template +++ b/srcpkgs/transmission/template @@ -1,7 +1,7 @@ # Template file for 'transmission' pkgname=transmission version=2.92 -revision=7 +revision=8 build_style=gnu-configure configure_args="--enable-nls --enable-cli --enable-daemon --enable-utp --without-systemd-daemon" hostmakedepends="pkg-config intltool" @@ -61,6 +61,7 @@ do_install() { post_install() { rm -f ${DESTDIR}/usr/share/${pkgname}/web/LICENSE vsv transmission-daemon + vlicense COPYING } transmission-qt_package() { diff --git a/srcpkgs/turses/template b/srcpkgs/turses/template new file mode 100644 index 00000000000..a662ca68c1c --- /dev/null +++ b/srcpkgs/turses/template @@ -0,0 +1,23 @@ +# Template file for 'turses' +pkgname=turses +version=0.3.1 +revision=1 +build_style=python2-module +short_desc="A Twitter client for the console" +maintainer="maxice8 " +hostmakedepends="python-setuptools" +depends="python-urwid python-future python-tweepy python-backports.configparser" +license="GPL-3" +homepage="https://pypi.python.org/pypi/turses" +distfiles="${PYPI_SITE}/t/turses/turses-${version}.tar.gz" +checksum=46a61541d1acd1338561a198b3011081b91f118415c08b111444cdb24685b396 +noarch=yes + +pre_build() { + # The package isn't updated for a time and the dependencies have been updated + # the build will work but running the program will fail because dependency + # versions don't match + sed '/tweepy==/d' -i setup.py + sed '/urwid==/d' -i setup.py + sed '/future==/d' -i setup.py +} diff --git a/srcpkgs/turses/update b/srcpkgs/turses/update new file mode 100644 index 00000000000..1fd50c4e5ce --- /dev/null +++ b/srcpkgs/turses/update @@ -0,0 +1 @@ +ignore="v*" diff --git a/srcpkgs/txtw/template b/srcpkgs/txtw/template new file mode 100644 index 00000000000..638eb000a26 --- /dev/null +++ b/srcpkgs/txtw/template @@ -0,0 +1,17 @@ +# Template file for 'txtw' +pkgname=txtw +version=0.4 +revision=1 +build_style=gnu-makefile +make_use_env=compliant +makedepends="cairo-devel" +short_desc="Return the pixel width of the given strings for a given font" +maintainer="maxice8 " +license="Unlicense" +homepage="https://github.com/baskerville/txtw" +distfiles="https://github.com/baskerville/txtw/archive/${version}.tar.gz" +checksum=b7c974ffda5b65421daee8c015f154b2a51daf2d736df841873d9b262c868846 + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/udiskie/template b/srcpkgs/udiskie/template index 4c5ee16270f..3f1592da44c 100644 --- a/srcpkgs/udiskie/template +++ b/srcpkgs/udiskie/template @@ -1,7 +1,7 @@ # Template file for 'udiskie' pkgname=udiskie -version=1.7.0 -revision=3 +version=1.7.2 +revision=1 noarch=yes build_style=python3-module pycompile_module="udiskie" @@ -12,8 +12,8 @@ short_desc="Removable disk automounter using udisks" maintainer="Matthias Fulz " homepage="https://github.com/coldfix/udiskie" license="MIT" -distfiles="${PYPI_SITE}/u/udiskie/udiskie-${version}.tar.gz" -checksum=2e2129bea9bbfe16a5c8ea1dfc86527806c0faf7c418b6446a6bf2c62c26c786 +distfiles="https://github.com/coldfix/udiskie/archive/${version}.tar.gz" +checksum=759e43a0fcbe6698676d8d59d912b6cf678ee289cfe4f7dc3b2447498c1fb314 post_install() { vlicense COPYING diff --git a/srcpkgs/unclutter-xfixes/template b/srcpkgs/unclutter-xfixes/template index a519ae33542..13c59eaaa17 100644 --- a/srcpkgs/unclutter-xfixes/template +++ b/srcpkgs/unclutter-xfixes/template @@ -1,7 +1,7 @@ # Template file for 'unclutter-xfixes' pkgname=unclutter-xfixes version=1.2 -revision=1 +revision=2 build_style=gnu-makefile make_install_args="PREFIX=/usr/bin" hostmakedepends="pkg-config asciidoc" @@ -15,3 +15,7 @@ checksum=addaf8fa4e7381a95ea2279eb47be675b52eb43efb83f7a78ac9044e53121d4a conflicts="unclutter>=0" CFLAGS="-D__VERSION=\\\"$version\\\"" + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/unzip/template b/srcpkgs/unzip/template index 64b508cb049..4aeabf78094 100644 --- a/srcpkgs/unzip/template +++ b/srcpkgs/unzip/template @@ -1,7 +1,7 @@ # Template file for 'unzip' pkgname=unzip version=6.0 -revision=9 +revision=10 makedepends="bzip2-devel" wrksrc=unzip60 short_desc="List, test and extract compressed files in a ZIP archive" @@ -28,4 +28,6 @@ do_install() { vmkdir usr/share mv ${DESTDIR}/usr/man ${DESTDIR}/usr/share + + vlicense LICENSE } diff --git a/srcpkgs/urxvt-bidi b/srcpkgs/urxvt-bidi new file mode 120000 index 00000000000..3044d75460a --- /dev/null +++ b/srcpkgs/urxvt-bidi @@ -0,0 +1 @@ +perl-Text-Bidi \ No newline at end of file diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template index a01b3c7c9e9..7ab278eb6d0 100644 --- a/srcpkgs/vala/template +++ b/srcpkgs/vala/template @@ -1,6 +1,6 @@ # Template file for 'vala' pkgname=vala -version=0.38.1 +version=0.38.2 revision=1 build_style=gnu-configure hostmakedepends="pkg-config flex libxslt automake libtool" @@ -10,10 +10,10 @@ maintainer="Enno Boland " homepage="http://live.gnome.org/Vala" license="LGPL-2.1" distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz" -checksum=1035344f3ba50a572894c0aed3f794dd0efb9f08fce1c1d0cc537936e9a05084 +checksum=20d5d9c4fbd17877969dbce27e6428da67138e116b1717cc07b5b75fd6ab78a7 pre_configure() { - autoreconf -fi + autoreconf -fi } libvala_package() { diff --git a/srcpkgs/vapoursynth-ffms2-source b/srcpkgs/vapoursynth-ffms2-source new file mode 120000 index 00000000000..7841b14b892 --- /dev/null +++ b/srcpkgs/vapoursynth-ffms2-source @@ -0,0 +1 @@ +ffms2 \ No newline at end of file diff --git a/srcpkgs/vdirsyncer/template b/srcpkgs/vdirsyncer/template index 612d33e54ec..39e15ed25ac 100644 --- a/srcpkgs/vdirsyncer/template +++ b/srcpkgs/vdirsyncer/template @@ -1,7 +1,7 @@ # Template file for 'vdirsyncer' pkgname=vdirsyncer -version=0.16.2 -revision=2 +version=0.16.3 +revision=1 noarch=yes build_style=python3-module pycompile_module="vdirsyncer" @@ -13,7 +13,7 @@ maintainer="Oliver Kiddle " license="3-clause-BSD" homepage="https://vdirsyncer.pimutils.org/" distfiles="${PYPI_SITE}/v/vdirsyncer/vdirsyncer-${version}.tar.gz" -checksum=aa819f29f4bcd1f7dd56a98dceddb71956ac890d8a34414df9a2defa58ffb8a7 +checksum=fc5f6c5225d588b01ee225358a7c096283896a2a26a4f02c9651cf93a25bfc36 pre_build() { sed -i setup.py \ diff --git a/srcpkgs/vdpauinfo/template b/srcpkgs/vdpauinfo/template index 3d762e67442..4fa76bc0e72 100644 --- a/srcpkgs/vdpauinfo/template +++ b/srcpkgs/vdpauinfo/template @@ -1,7 +1,7 @@ # Template file for 'vdpauinfo' pkgname=vdpauinfo version=1.0 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libvdpau-devel" @@ -11,3 +11,7 @@ license="MIT" homepage="http://cgit.freedesktop.org/~aplattner/vdpauinfo" distfiles="http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${version}.tar.gz" checksum=4054960b7ae618c351ff1ce3e7831b5cbda964ae1fbf9969b7146404d3044bc4 + +post_install() { + vlicense COPYING +} diff --git a/srcpkgs/vdrift/template b/srcpkgs/vdrift/template index 2ea9c224204..d1c61da80d7 100644 --- a/srcpkgs/vdrift/template +++ b/srcpkgs/vdrift/template @@ -1,7 +1,7 @@ # Template file for 'vdrift' pkgname=vdrift version=2014.10.20 -revision=3 +revision=5 wrksrc="${pkgname}" build_style=scons make_build_args="release=1 force_feedback=1 extbullet=1 datadir=share/$pkgname" diff --git a/srcpkgs/vpnc-scripts/template b/srcpkgs/vpnc-scripts/template index 54b40ad8bf8..b86095c8511 100644 --- a/srcpkgs/vpnc-scripts/template +++ b/srcpkgs/vpnc-scripts/template @@ -1,6 +1,6 @@ # Template file for 'vpnc-scripts' pkgname=vpnc-scripts -version=20161215 +version=20171005 revision=1 noarch=yes short_desc="Network configuration scripts for VPNC and OpenConnect" @@ -8,7 +8,7 @@ maintainer="Eivind Uggedal " license="GPL-2" homepage="http://www.infradead.org/openconnect/vpnc-script.html" distfiles="ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=31651490426279d7e8d4139cb7ff88093f7835702be2f42ef1d59df70496897c +checksum=5daec557ce8a011e627271defe021b4d7dd9534f77919082650a5d1d7c21c690 do_install() { vinstall vpnc-script 755 usr/libexec/vpnc-scripts diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template index 343bf74b135..fa2bc56179a 100644 --- a/srcpkgs/vte3/template +++ b/srcpkgs/vte3/template @@ -1,6 +1,6 @@ # Template build file for 'vte3'. pkgname=vte3 -version=0.50.0 +version=0.50.1 revision=1 wrksrc=vte-${version} build_style=gnu-configure @@ -15,7 +15,7 @@ maintainer="Enno Boland " homepage="http://www.gnome.org" license="LGPL-2.1" distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz" -checksum=b893ae819c77857e4f4b059e7b4b8a9a49efa397cf548d91e8e02ebe30f09656 +checksum=cf1708e3e573160e1db107014b3ef70888fefe6b668373fed70e8d1cac45a8c2 # Suppress warnings as errors for NULL format strings (musl libc) CXXFLAGS="-Wno-error=format=" diff --git a/srcpkgs/wayland-protocols/template b/srcpkgs/wayland-protocols/template index 105a4619a04..7ffc5ceb52b 100644 --- a/srcpkgs/wayland-protocols/template +++ b/srcpkgs/wayland-protocols/template @@ -1,6 +1,6 @@ # Template file for 'wayland-protocols' pkgname=wayland-protocols -version=1.10 +version=1.11 revision=1 build_style=gnu-configure hostmakedepends="pkg-config wayland-devel" @@ -9,7 +9,7 @@ maintainer="Sir_Boops " license="MIT" homepage="http://wayland.freedesktop.org" distfiles="https://wayland.freedesktop.org/releases/wayland-protocols-${version}.tar.xz" -checksum=5719c51d7354864983171c5083e93a72ac99229e2b460c4bb10513de08839c0a +checksum=3afcee1d51c5b1d70b59da790c9830b354236324b19b2b7af9683bd3b7be6804 post_install() { vlicense COPYING diff --git a/srcpkgs/wayland/template b/srcpkgs/wayland/template index 44d6d053740..c1230e9df3a 100644 --- a/srcpkgs/wayland/template +++ b/srcpkgs/wayland/template @@ -1,6 +1,6 @@ # Template file for 'wayland'. pkgname=wayland -version=1.13.0 +version=1.14.0 revision=1 build_style=gnu-configure configure_args="--disable-documentation --disable-static" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://wayland.freedesktop.org/" license="MIT" distfiles="http://wayland.freedesktop.org/releases/wayland-${version}.tar.xz" -checksum=69b052c031a61e89af7cc8780893d0da1e301492352aa449dee9345043e6fe51 +checksum=ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8 pre_configure() { autoreconf -fi diff --git a/srcpkgs/webkit2gtk/patches/fix-header-location.patch b/srcpkgs/webkit2gtk/patches/fix-header-location.patch deleted file mode 100644 index 2756d579321..00000000000 --- a/srcpkgs/webkit2gtk/patches/fix-header-location.patch +++ /dev/null @@ -1,14 +0,0 @@ -fix header file location. -source: https://bugs.webkit.org/show_bug.cgi?id=176983 - ---- Source/WebCore/platform/graphics/cairo/BackingStoreBackendCairoImpl.h.ORIG -+++ Source/WebCore/platform/graphics/cairo/BackingStoreBackendCairoImpl.h -@@ -20,7 +20,7 @@ - - #if USE(CAIRO) - #include "BackingStoreBackendCairo.h" --#include -+#include - - namespace WebCore { - diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template index 2a2ca0e1e9c..5e7b1e6a17a 100644 --- a/srcpkgs/webkit2gtk/template +++ b/srcpkgs/webkit2gtk/template @@ -1,6 +1,6 @@ # Template file for 'webkit2gtk' pkgname=webkit2gtk -version=2.18.0 +version=2.18.1 revision=1 wrksrc="webkitgtk-$version" build_style=cmake @@ -11,7 +11,7 @@ maintainer="Enno Boland " homepage="https://webkitgtk.org/" license="LGPL-2.1, 2-clause-BSD" distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz" -checksum=b583e46a3de36a3e80ba33b084ead60512a2046aca01ff61e50e519436e5038d +checksum=9cdb7b302fbc8a2a7e1e783b80391e64f8b12d70d6ebad4eb756dd59bf3ed795 # ETOOHUGE nodebug=1 diff --git a/srcpkgs/weston/patches/musl-tests.patch b/srcpkgs/weston/patches/musl-tests.patch new file mode 100644 index 00000000000..805552e8593 --- /dev/null +++ b/srcpkgs/weston/patches/musl-tests.patch @@ -0,0 +1,10 @@ +--- shared/timespec-util.h.orig 2017-10-16 13:45:42.189826321 +0200 ++++ shared/timespec-util.h 2017-10-16 13:45:52.780979880 +0200 +@@ -28,6 +28,7 @@ + + #include + #include ++#include + + #define NSEC_PER_SEC 1000000000 + diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template index 59396fa62a1..cd6912483d0 100644 --- a/srcpkgs/weston/template +++ b/srcpkgs/weston/template @@ -1,7 +1,7 @@ # Template file for 'weston'. pkgname=weston -version=2.0.0 -revision=3 +version=3.0.0 +revision=1 build_style=gnu-configure # XXX enable rdp compositor if freerdp is updated to >=1.1. configure_args="--enable-libinput-backend --disable-setuid-install @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://wayland.freedesktop.org/" license="MIT" distfiles="http://wayland.freedesktop.org/releases/${pkgname}-${version}.tar.xz" -checksum=b4e446ac27f118196f1609dab89bb3cb3e81652d981414ad860e733b355365d8 +checksum=cde1d55e8dd70c3cbb3d1ec72f60e60000041579caa1d6a262bd9c35e93723a5 system_groups="weston-launch" lib32disabled=yes @@ -31,6 +31,7 @@ build_options_default="dbus" case "$XBPS_TARGET_MACHINE" in armv[67]l*) # Assume RPi for now. + broken="https://cgit.freedesktop.org/wayland/weston/commit/?id=ca52b31d3f867d9a14b2a3b9fcd4f21aa5fb0a3d" CFLAGS="-I${XBPS_CROSS_BASE}/opt/vc/include" LDFLAGS="-Wl,-R/opt/vc/lib" makedepends+=" rpi-userland-devel" @@ -46,9 +47,6 @@ x86_64*|i686*) makedepends+=" glu-devel libva-devel" configure_args+=" --enable-vaapi-recorder" ;; -aarch64*) - broken="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/1785/steps/shell_3/logs/stdio" - ;; esac pre_configure() { @@ -72,12 +70,12 @@ weston-colord_package() { weston-x11_package() { short_desc+=" - x11 backend" pkg_install() { - vmove /usr/lib/libweston-2/x11-backend.so + vmove /usr/lib/libweston-3/x11-backend.so } } weston-xwayland_package() { short_desc+=" - xwayland backend" pkg_install() { - vmove /usr/lib/libweston-2/xwayland.so + vmove /usr/lib/libweston-3/xwayland.so } } diff --git a/srcpkgs/winetricks/template b/srcpkgs/winetricks/template index 80b3c808c86..04c7b6319ab 100644 --- a/srcpkgs/winetricks/template +++ b/srcpkgs/winetricks/template @@ -1,6 +1,6 @@ # Template file for 'winetricks' pkgname=winetricks -version=20170823 +version=20171018 revision=1 noarch=yes build_style=gnu-makefile @@ -10,4 +10,4 @@ maintainer="Andrea Brancaleoni " license="LGPL-3" homepage="http://wiki.winehq.org/$pkgname" distfiles="https://github.com/Winetricks/$pkgname/archive/$version.tar.gz" -checksum=0e7e007b0dd39f773213a5540e7c44e4105d9435ef067c0efdcc6fda70c029de +checksum=ad60a2ffbffbe62c47e4f85767436814e67c5a42b838ba30b40a4fa36e5ab0cc diff --git a/srcpkgs/wireguard/template b/srcpkgs/wireguard/template index b6a025e08b7..2adca743071 100644 --- a/srcpkgs/wireguard/template +++ b/srcpkgs/wireguard/template @@ -1,6 +1,6 @@ # Template file for 'wireguard' pkgname=wireguard -version=0.0.20171011 +version=0.0.20171017 revision=1 wrksrc="WireGuard-${version}" build_wrksrc="src/tools" @@ -13,7 +13,7 @@ maintainer="Leah Neukirchen " license="GPL-2" homepage="https://www.wireguard.io/" distfiles="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz" -checksum=e2e44ff658743507bca0f6b443c2f85aacc48d507ba2dcd4812717145df10b96 +checksum=57b79a62874d9b99659a744513d4f6f9d88cb772deaa99e485b6fed3004a35cd triggers="dkms" dkms_modules="wireguard ${version}" diff --git a/srcpkgs/wmname/template b/srcpkgs/wmname/template index 4192672ea87..485d65de98e 100644 --- a/srcpkgs/wmname/template +++ b/srcpkgs/wmname/template @@ -1,16 +1,20 @@ # Template file for 'wmname' pkgname=wmname version=0.1 -revision=4 +revision=5 build_style=gnu-makefile makedepends="libX11-devel" -short_desc="change the window manager name" +short_desc="Change the window manager name" maintainer="Juan RP " license="MIT" homepage="http://www.suckless.org/" distfiles="http://dl.suckless.org/tools/${pkgname}-${version}.tar.gz" checksum=559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5 +post_install() { + vlicense LICENSE +} + do_build() { sed -e '/strip/d' -i Makefile make CC=$CC INCS=-I. LDFLAGS="-lX11 $LDFLAGS" CFLAGS="$CFLAGS -DVERSION=\\\"$version\\\"" diff --git a/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch b/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch new file mode 100644 index 00000000000..d9370ebf5d7 --- /dev/null +++ b/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch @@ -0,0 +1,174 @@ +From cf4cab804c7afd5c45505528a8d16e46163243a2 Mon Sep 17 00:00:00 2001 +From: Mathy Vanhoef +Date: Fri, 14 Jul 2017 15:15:35 +0200 +Subject: [PATCH 1/8] hostapd: Avoid key reinstallation in FT handshake + +Do not reinstall TK to the driver during Reassociation Response frame +processing if the first attempt of setting the TK succeeded. This avoids +issues related to clearing the TX/RX PN that could result in reusing +same PN values for transmitted frames (e.g., due to CCM nonce reuse and +also hitting replay protection on the receiver) and accepting replayed +frames on RX side. + +This issue was introduced by the commit +0e84c25434e6a1f283c7b4e62e483729085b78d2 ('FT: Fix PTK configuration in +authenticator') which allowed wpa_ft_install_ptk() to be called multiple +times with the same PTK. While the second configuration attempt is +needed with some drivers, it must be done only if the first attempt +failed. + +Signed-off-by: Mathy Vanhoef +--- + src/ap/ieee802_11.c | 16 +++++++++++++--- + src/ap/wpa_auth.c | 11 +++++++++++ + src/ap/wpa_auth.h | 3 ++- + src/ap/wpa_auth_ft.c | 10 ++++++++++ + src/ap/wpa_auth_i.h | 1 + + 5 files changed, 37 insertions(+), 4 deletions(-) + +diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c +index 4e04169..333035f 100644 +--- src/ap/ieee802_11.c ++++ src/ap/ieee802_11.c +@@ -1841,6 +1841,7 @@ static int add_associated_sta(struct hostapd_data *hapd, + { + struct ieee80211_ht_capabilities ht_cap; + struct ieee80211_vht_capabilities vht_cap; ++ int set = 1; + + /* + * Remove the STA entry to ensure the STA PS state gets cleared and +@@ -1848,9 +1849,18 @@ static int add_associated_sta(struct hostapd_data *hapd, + * FT-over-the-DS, where a station re-associates back to the same AP but + * skips the authentication flow, or if working with a driver that + * does not support full AP client state. ++ * ++ * Skip this if the STA has already completed FT reassociation and the ++ * TK has been configured since the TX/RX PN must not be reset to 0 for ++ * the same key. + */ +- if (!sta->added_unassoc) ++ if (!sta->added_unassoc && ++ (!(sta->flags & WLAN_STA_AUTHORIZED) || ++ !wpa_auth_sta_ft_tk_already_set(sta->wpa_sm))) { + hostapd_drv_sta_remove(hapd, sta->addr); ++ wpa_auth_sm_event(sta->wpa_sm, WPA_DRV_STA_REMOVED); ++ set = 0; ++ } + + #ifdef CONFIG_IEEE80211N + if (sta->flags & WLAN_STA_HT) +@@ -1873,11 +1883,11 @@ static int add_associated_sta(struct hostapd_data *hapd, + sta->flags & WLAN_STA_VHT ? &vht_cap : NULL, + sta->flags | WLAN_STA_ASSOC, sta->qosinfo, + sta->vht_opmode, sta->p2p_ie ? 1 : 0, +- sta->added_unassoc)) { ++ set)) { + hostapd_logger(hapd, sta->addr, + HOSTAPD_MODULE_IEEE80211, HOSTAPD_LEVEL_NOTICE, + "Could not %s STA to kernel driver", +- sta->added_unassoc ? "set" : "add"); ++ set ? "set" : "add"); + + if (sta->added_unassoc) { + hostapd_drv_sta_remove(hapd, sta->addr); +diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c +index 3587086..707971d 100644 +--- src/ap/wpa_auth.c ++++ src/ap/wpa_auth.c +@@ -1745,6 +1745,9 @@ int wpa_auth_sm_event(struct wpa_state_machine *sm, enum wpa_event event) + #else /* CONFIG_IEEE80211R */ + break; + #endif /* CONFIG_IEEE80211R */ ++ case WPA_DRV_STA_REMOVED: ++ sm->tk_already_set = FALSE; ++ return 0; + } + + #ifdef CONFIG_IEEE80211R +@@ -3250,6 +3253,14 @@ int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm) + } + + ++int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm) ++{ ++ if (!sm || !wpa_key_mgmt_ft(sm->wpa_key_mgmt)) ++ return 0; ++ return sm->tk_already_set; ++} ++ ++ + int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm, + struct rsn_pmksa_cache_entry *entry) + { +diff --git a/src/ap/wpa_auth.h b/src/ap/wpa_auth.h +index 0de8d97..97461b0 100644 +--- src/ap/wpa_auth.h ++++ src/ap/wpa_auth.h +@@ -267,7 +267,7 @@ void wpa_receive(struct wpa_authenticator *wpa_auth, + u8 *data, size_t data_len); + enum wpa_event { + WPA_AUTH, WPA_ASSOC, WPA_DISASSOC, WPA_DEAUTH, WPA_REAUTH, +- WPA_REAUTH_EAPOL, WPA_ASSOC_FT ++ WPA_REAUTH_EAPOL, WPA_ASSOC_FT, WPA_DRV_STA_REMOVED + }; + void wpa_remove_ptk(struct wpa_state_machine *sm); + int wpa_auth_sm_event(struct wpa_state_machine *sm, enum wpa_event event); +@@ -280,6 +280,7 @@ int wpa_auth_pairwise_set(struct wpa_state_machine *sm); + int wpa_auth_get_pairwise(struct wpa_state_machine *sm); + int wpa_auth_sta_key_mgmt(struct wpa_state_machine *sm); + int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm); ++int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm); + int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm, + struct rsn_pmksa_cache_entry *entry); + struct rsn_pmksa_cache_entry * +diff --git a/src/ap/wpa_auth_ft.c b/src/ap/wpa_auth_ft.c +index 42242a5..e63b99a 100644 +--- src/ap/wpa_auth_ft.c ++++ src/ap/wpa_auth_ft.c +@@ -780,6 +780,14 @@ void wpa_ft_install_ptk(struct wpa_state_machine *sm) + return; + } + ++ if (sm->tk_already_set) { ++ /* Must avoid TK reconfiguration to prevent clearing of TX/RX ++ * PN in the driver */ ++ wpa_printf(MSG_DEBUG, ++ "FT: Do not re-install same PTK to the driver"); ++ return; ++ } ++ + /* FIX: add STA entry to kernel/driver here? The set_key will fail + * most likely without this.. At the moment, STA entry is added only + * after association has been completed. This function will be called +@@ -792,6 +800,7 @@ void wpa_ft_install_ptk(struct wpa_state_machine *sm) + + /* FIX: MLME-SetProtection.Request(TA, Tx_Rx) */ + sm->pairwise_set = TRUE; ++ sm->tk_already_set = TRUE; + } + + +@@ -898,6 +907,7 @@ static int wpa_ft_process_auth_req(struct wpa_state_machine *sm, + + sm->pairwise = pairwise; + sm->PTK_valid = TRUE; ++ sm->tk_already_set = FALSE; + wpa_ft_install_ptk(sm); + + buflen = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) + +diff --git a/src/ap/wpa_auth_i.h b/src/ap/wpa_auth_i.h +index 72b7eb3..7fd8f05 100644 +--- src/ap/wpa_auth_i.h ++++ src/ap/wpa_auth_i.h +@@ -65,6 +65,7 @@ struct wpa_state_machine { + struct wpa_ptk PTK; + Boolean PTK_valid; + Boolean pairwise_set; ++ Boolean tk_already_set; + int keycount; + Boolean Pair; + struct wpa_key_replay_counter { +-- +2.7.4 + diff --git a/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch b/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch new file mode 100644 index 00000000000..af994d85def --- /dev/null +++ b/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch @@ -0,0 +1,250 @@ +From 927f891007c402fefd1ff384645b3f07597c3ede Mon Sep 17 00:00:00 2001 +From: Mathy Vanhoef +Date: Wed, 12 Jul 2017 16:03:24 +0200 +Subject: [PATCH 2/8] Prevent reinstallation of an already in-use group key + +Track the current GTK and IGTK that is in use and when receiving a +(possibly retransmitted) Group Message 1 or WNM-Sleep Mode Response, do +not install the given key if it is already in use. This prevents an +attacker from trying to trick the client into resetting or lowering the +sequence counter associated to the group key. + +Signed-off-by: Mathy Vanhoef +--- + src/common/wpa_common.h | 11 +++++ + src/rsn_supp/wpa.c | 116 ++++++++++++++++++++++++++++++------------------ + src/rsn_supp/wpa_i.h | 4 ++ + 3 files changed, 87 insertions(+), 44 deletions(-) + +diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h +index af1d0f0..d200285 100644 +--- src/common/wpa_common.h ++++ src/common/wpa_common.h +@@ -217,6 +217,17 @@ struct wpa_ptk { + size_t tk_len; + }; + ++struct wpa_gtk { ++ u8 gtk[WPA_GTK_MAX_LEN]; ++ size_t gtk_len; ++}; ++ ++#ifdef CONFIG_IEEE80211W ++struct wpa_igtk { ++ u8 igtk[WPA_IGTK_MAX_LEN]; ++ size_t igtk_len; ++}; ++#endif /* CONFIG_IEEE80211W */ + + /* WPA IE version 1 + * 00-50-f2:1 (OUI:OUI type) +diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c +index 3c47879..95bd7be 100644 +--- src/rsn_supp/wpa.c ++++ src/rsn_supp/wpa.c +@@ -714,6 +714,15 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm, + const u8 *_gtk = gd->gtk; + u8 gtk_buf[32]; + ++ /* Detect possible key reinstallation */ ++ if (sm->gtk.gtk_len == (size_t) gd->gtk_len && ++ os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) { ++ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, ++ "WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)", ++ gd->keyidx, gd->tx, gd->gtk_len); ++ return 0; ++ } ++ + wpa_hexdump_key(MSG_DEBUG, "WPA: Group Key", gd->gtk, gd->gtk_len); + wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, + "WPA: Installing GTK to the driver (keyidx=%d tx=%d len=%d)", +@@ -748,6 +757,9 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm, + } + os_memset(gtk_buf, 0, sizeof(gtk_buf)); + ++ sm->gtk.gtk_len = gd->gtk_len; ++ os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len); ++ + return 0; + } + +@@ -854,6 +866,48 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm, + } + + ++#ifdef CONFIG_IEEE80211W ++static int wpa_supplicant_install_igtk(struct wpa_sm *sm, ++ const struct wpa_igtk_kde *igtk) ++{ ++ size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher); ++ u16 keyidx = WPA_GET_LE16(igtk->keyid); ++ ++ /* Detect possible key reinstallation */ ++ if (sm->igtk.igtk_len == len && ++ os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) { ++ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, ++ "WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)", ++ keyidx); ++ return 0; ++ } ++ ++ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, ++ "WPA: IGTK keyid %d pn %02x%02x%02x%02x%02x%02x", ++ keyidx, MAC2STR(igtk->pn)); ++ wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK", igtk->igtk, len); ++ if (keyidx > 4095) { ++ wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, ++ "WPA: Invalid IGTK KeyID %d", keyidx); ++ return -1; ++ } ++ if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher), ++ broadcast_ether_addr, ++ keyidx, 0, igtk->pn, sizeof(igtk->pn), ++ igtk->igtk, len) < 0) { ++ wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, ++ "WPA: Failed to configure IGTK to the driver"); ++ return -1; ++ } ++ ++ sm->igtk.igtk_len = len; ++ os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len); ++ ++ return 0; ++} ++#endif /* CONFIG_IEEE80211W */ ++ ++ + static int ieee80211w_set_keys(struct wpa_sm *sm, + struct wpa_eapol_ie_parse *ie) + { +@@ -864,30 +918,14 @@ static int ieee80211w_set_keys(struct wpa_sm *sm, + if (ie->igtk) { + size_t len; + const struct wpa_igtk_kde *igtk; +- u16 keyidx; ++ + len = wpa_cipher_key_len(sm->mgmt_group_cipher); + if (ie->igtk_len != WPA_IGTK_KDE_PREFIX_LEN + len) + return -1; ++ + igtk = (const struct wpa_igtk_kde *) ie->igtk; +- keyidx = WPA_GET_LE16(igtk->keyid); +- wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, "WPA: IGTK keyid %d " +- "pn %02x%02x%02x%02x%02x%02x", +- keyidx, MAC2STR(igtk->pn)); +- wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK", +- igtk->igtk, len); +- if (keyidx > 4095) { +- wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, +- "WPA: Invalid IGTK KeyID %d", keyidx); +- return -1; +- } +- if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher), +- broadcast_ether_addr, +- keyidx, 0, igtk->pn, sizeof(igtk->pn), +- igtk->igtk, len) < 0) { +- wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, +- "WPA: Failed to configure IGTK to the driver"); ++ if (wpa_supplicant_install_igtk(sm, igtk) < 0) + return -1; +- } + } + + return 0; +@@ -2307,7 +2345,7 @@ void wpa_sm_deinit(struct wpa_sm *sm) + */ + void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) + { +- int clear_ptk = 1; ++ int clear_keys = 1; + + if (sm == NULL) + return; +@@ -2333,11 +2371,11 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) + /* Prepare for the next transition */ + wpa_ft_prepare_auth_request(sm, NULL); + +- clear_ptk = 0; ++ clear_keys = 0; + } + #endif /* CONFIG_IEEE80211R */ + +- if (clear_ptk) { ++ if (clear_keys) { + /* + * IEEE 802.11, 8.4.10: Delete PTK SA on (re)association if + * this is not part of a Fast BSS Transition. +@@ -2347,6 +2385,10 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) + os_memset(&sm->ptk, 0, sizeof(sm->ptk)); + sm->tptk_set = 0; + os_memset(&sm->tptk, 0, sizeof(sm->tptk)); ++ os_memset(&sm->gtk, 0, sizeof(sm->gtk)); ++#ifdef CONFIG_IEEE80211W ++ os_memset(&sm->igtk, 0, sizeof(sm->igtk)); ++#endif /* CONFIG_IEEE80211W */ + } + + #ifdef CONFIG_TDLS +@@ -2877,6 +2919,10 @@ void wpa_sm_drop_sa(struct wpa_sm *sm) + os_memset(sm->pmk, 0, sizeof(sm->pmk)); + os_memset(&sm->ptk, 0, sizeof(sm->ptk)); + os_memset(&sm->tptk, 0, sizeof(sm->tptk)); ++ os_memset(&sm->gtk, 0, sizeof(sm->gtk)); ++#ifdef CONFIG_IEEE80211W ++ os_memset(&sm->igtk, 0, sizeof(sm->igtk)); ++#endif /* CONFIG_IEEE80211W */ + #ifdef CONFIG_IEEE80211R + os_memset(sm->xxkey, 0, sizeof(sm->xxkey)); + os_memset(sm->pmk_r0, 0, sizeof(sm->pmk_r0)); +@@ -2949,29 +2995,11 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf) + os_memset(&gd, 0, sizeof(gd)); + #ifdef CONFIG_IEEE80211W + } else if (subelem_id == WNM_SLEEP_SUBELEM_IGTK) { +- struct wpa_igtk_kde igd; +- u16 keyidx; +- +- os_memset(&igd, 0, sizeof(igd)); +- keylen = wpa_cipher_key_len(sm->mgmt_group_cipher); +- os_memcpy(igd.keyid, buf + 2, 2); +- os_memcpy(igd.pn, buf + 4, 6); +- +- keyidx = WPA_GET_LE16(igd.keyid); +- os_memcpy(igd.igtk, buf + 10, keylen); +- +- wpa_hexdump_key(MSG_DEBUG, "Install IGTK (WNM SLEEP)", +- igd.igtk, keylen); +- if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher), +- broadcast_ether_addr, +- keyidx, 0, igd.pn, sizeof(igd.pn), +- igd.igtk, keylen) < 0) { +- wpa_printf(MSG_DEBUG, "Failed to install the IGTK in " +- "WNM mode"); +- os_memset(&igd, 0, sizeof(igd)); ++ const struct wpa_igtk_kde *igtk; ++ ++ igtk = (const struct wpa_igtk_kde *) (buf + 2); ++ if (wpa_supplicant_install_igtk(sm, igtk) < 0) + return -1; +- } +- os_memset(&igd, 0, sizeof(igd)); + #endif /* CONFIG_IEEE80211W */ + } else { + wpa_printf(MSG_DEBUG, "Unknown element id"); +diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h +index f653ba6..afc9e37 100644 +--- src/rsn_supp/wpa_i.h ++++ src/rsn_supp/wpa_i.h +@@ -31,6 +31,10 @@ struct wpa_sm { + u8 rx_replay_counter[WPA_REPLAY_COUNTER_LEN]; + int rx_replay_counter_set; + u8 request_counter[WPA_REPLAY_COUNTER_LEN]; ++ struct wpa_gtk gtk; ++#ifdef CONFIG_IEEE80211W ++ struct wpa_igtk igtk; ++#endif /* CONFIG_IEEE80211W */ + + struct eapol_sm *eapol; /* EAPOL state machine from upper level code */ + +-- +2.7.4 + diff --git a/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch b/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch new file mode 100644 index 00000000000..c0b8f8abaaf --- /dev/null +++ b/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch @@ -0,0 +1,184 @@ +From 8280294e74846ea342389a0cd17215050fa5afe8 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Sun, 1 Oct 2017 12:12:24 +0300 +Subject: [PATCH 3/8] Extend protection of GTK/IGTK reinstallation of WNM-Sleep + Mode cases + +This extends the protection to track last configured GTK/IGTK value +separately from EAPOL-Key frames and WNM-Sleep Mode frames to cover a +corner case where these two different mechanisms may get used when the +GTK/IGTK has changed and tracking a single value is not sufficient to +detect a possible key reconfiguration. + +Signed-off-by: Jouni Malinen +--- + src/rsn_supp/wpa.c | 53 +++++++++++++++++++++++++++++++++++++--------------- + src/rsn_supp/wpa_i.h | 2 ++ + 2 files changed, 40 insertions(+), 15 deletions(-) + +diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c +index 95bd7be..7a2c68d 100644 +--- src/rsn_supp/wpa.c ++++ src/rsn_supp/wpa.c +@@ -709,14 +709,17 @@ struct wpa_gtk_data { + + static int wpa_supplicant_install_gtk(struct wpa_sm *sm, + const struct wpa_gtk_data *gd, +- const u8 *key_rsc) ++ const u8 *key_rsc, int wnm_sleep) + { + const u8 *_gtk = gd->gtk; + u8 gtk_buf[32]; + + /* Detect possible key reinstallation */ +- if (sm->gtk.gtk_len == (size_t) gd->gtk_len && +- os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) { ++ if ((sm->gtk.gtk_len == (size_t) gd->gtk_len && ++ os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) || ++ (sm->gtk_wnm_sleep.gtk_len == (size_t) gd->gtk_len && ++ os_memcmp(sm->gtk_wnm_sleep.gtk, gd->gtk, ++ sm->gtk_wnm_sleep.gtk_len) == 0)) { + wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, + "WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)", + gd->keyidx, gd->tx, gd->gtk_len); +@@ -757,8 +760,14 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm, + } + os_memset(gtk_buf, 0, sizeof(gtk_buf)); + +- sm->gtk.gtk_len = gd->gtk_len; +- os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len); ++ if (wnm_sleep) { ++ sm->gtk_wnm_sleep.gtk_len = gd->gtk_len; ++ os_memcpy(sm->gtk_wnm_sleep.gtk, gd->gtk, ++ sm->gtk_wnm_sleep.gtk_len); ++ } else { ++ sm->gtk.gtk_len = gd->gtk_len; ++ os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len); ++ } + + return 0; + } +@@ -852,7 +861,7 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm, + (wpa_supplicant_check_group_cipher(sm, sm->group_cipher, + gtk_len, gtk_len, + &gd.key_rsc_len, &gd.alg) || +- wpa_supplicant_install_gtk(sm, &gd, key_rsc))) { ++ wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0))) { + wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, + "RSN: Failed to install GTK"); + os_memset(&gd, 0, sizeof(gd)); +@@ -868,14 +877,18 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm, + + #ifdef CONFIG_IEEE80211W + static int wpa_supplicant_install_igtk(struct wpa_sm *sm, +- const struct wpa_igtk_kde *igtk) ++ const struct wpa_igtk_kde *igtk, ++ int wnm_sleep) + { + size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher); + u16 keyidx = WPA_GET_LE16(igtk->keyid); + + /* Detect possible key reinstallation */ +- if (sm->igtk.igtk_len == len && +- os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) { ++ if ((sm->igtk.igtk_len == len && ++ os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) || ++ (sm->igtk_wnm_sleep.igtk_len == len && ++ os_memcmp(sm->igtk_wnm_sleep.igtk, igtk->igtk, ++ sm->igtk_wnm_sleep.igtk_len) == 0)) { + wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, + "WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)", + keyidx); +@@ -900,8 +913,14 @@ static int wpa_supplicant_install_igtk(struct wpa_sm *sm, + return -1; + } + +- sm->igtk.igtk_len = len; +- os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len); ++ if (wnm_sleep) { ++ sm->igtk_wnm_sleep.igtk_len = len; ++ os_memcpy(sm->igtk_wnm_sleep.igtk, igtk->igtk, ++ sm->igtk_wnm_sleep.igtk_len); ++ } else { ++ sm->igtk.igtk_len = len; ++ os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len); ++ } + + return 0; + } +@@ -924,7 +943,7 @@ static int ieee80211w_set_keys(struct wpa_sm *sm, + return -1; + + igtk = (const struct wpa_igtk_kde *) ie->igtk; +- if (wpa_supplicant_install_igtk(sm, igtk) < 0) ++ if (wpa_supplicant_install_igtk(sm, igtk, 0) < 0) + return -1; + } + +@@ -1574,7 +1593,7 @@ static void wpa_supplicant_process_1_of_2(struct wpa_sm *sm, + if (wpa_supplicant_rsc_relaxation(sm, key->key_rsc)) + key_rsc = null_rsc; + +- if (wpa_supplicant_install_gtk(sm, &gd, key_rsc) || ++ if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0) || + wpa_supplicant_send_2_of_2(sm, key, ver, key_info) < 0) + goto failed; + os_memset(&gd, 0, sizeof(gd)); +@@ -2386,8 +2405,10 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) + sm->tptk_set = 0; + os_memset(&sm->tptk, 0, sizeof(sm->tptk)); + os_memset(&sm->gtk, 0, sizeof(sm->gtk)); ++ os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep)); + #ifdef CONFIG_IEEE80211W + os_memset(&sm->igtk, 0, sizeof(sm->igtk)); ++ os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep)); + #endif /* CONFIG_IEEE80211W */ + } + +@@ -2920,8 +2941,10 @@ void wpa_sm_drop_sa(struct wpa_sm *sm) + os_memset(&sm->ptk, 0, sizeof(sm->ptk)); + os_memset(&sm->tptk, 0, sizeof(sm->tptk)); + os_memset(&sm->gtk, 0, sizeof(sm->gtk)); ++ os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep)); + #ifdef CONFIG_IEEE80211W + os_memset(&sm->igtk, 0, sizeof(sm->igtk)); ++ os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep)); + #endif /* CONFIG_IEEE80211W */ + #ifdef CONFIG_IEEE80211R + os_memset(sm->xxkey, 0, sizeof(sm->xxkey)); +@@ -2986,7 +3009,7 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf) + + wpa_hexdump_key(MSG_DEBUG, "Install GTK (WNM SLEEP)", + gd.gtk, gd.gtk_len); +- if (wpa_supplicant_install_gtk(sm, &gd, key_rsc)) { ++ if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 1)) { + os_memset(&gd, 0, sizeof(gd)); + wpa_printf(MSG_DEBUG, "Failed to install the GTK in " + "WNM mode"); +@@ -2998,7 +3021,7 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf) + const struct wpa_igtk_kde *igtk; + + igtk = (const struct wpa_igtk_kde *) (buf + 2); +- if (wpa_supplicant_install_igtk(sm, igtk) < 0) ++ if (wpa_supplicant_install_igtk(sm, igtk, 1) < 0) + return -1; + #endif /* CONFIG_IEEE80211W */ + } else { +diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h +index afc9e37..9a54631 100644 +--- src/rsn_supp/wpa_i.h ++++ src/rsn_supp/wpa_i.h +@@ -32,8 +32,10 @@ struct wpa_sm { + int rx_replay_counter_set; + u8 request_counter[WPA_REPLAY_COUNTER_LEN]; + struct wpa_gtk gtk; ++ struct wpa_gtk gtk_wnm_sleep; + #ifdef CONFIG_IEEE80211W + struct wpa_igtk igtk; ++ struct wpa_igtk igtk_wnm_sleep; + #endif /* CONFIG_IEEE80211W */ + + struct eapol_sm *eapol; /* EAPOL state machine from upper level code */ +-- +2.7.4 + diff --git a/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch b/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch new file mode 100644 index 00000000000..bdd8d39727b --- /dev/null +++ b/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch @@ -0,0 +1,79 @@ +From 8f82bc94e8697a9d47fa8774dfdaaede1084912c Mon Sep 17 00:00:00 2001 +From: Mathy Vanhoef +Date: Fri, 29 Sep 2017 04:22:51 +0200 +Subject: [PATCH 4/8] Prevent installation of an all-zero TK + +Properly track whether a PTK has already been installed to the driver +and the TK part cleared from memory. This prevents an attacker from +trying to trick the client into installing an all-zero TK. + +This fixes the earlier fix in commit +ad00d64e7d8827b3cebd665a0ceb08adabf15e1e ('Fix TK configuration to the +driver in EAPOL-Key 3/4 retry case') which did not take into account +possibility of an extra message 1/4 showing up between retries of +message 3/4. + +Signed-off-by: Mathy Vanhoef +--- + src/common/wpa_common.h | 1 + + src/rsn_supp/wpa.c | 5 ++--- + src/rsn_supp/wpa_i.h | 1 - + 3 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h +index d200285..1021ccb 100644 +--- src/common/wpa_common.h ++++ src/common/wpa_common.h +@@ -215,6 +215,7 @@ struct wpa_ptk { + size_t kck_len; + size_t kek_len; + size_t tk_len; ++ int installed; /* 1 if key has already been installed to driver */ + }; + + struct wpa_gtk { +diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c +index 7a2c68d..0550a41 100644 +--- src/rsn_supp/wpa.c ++++ src/rsn_supp/wpa.c +@@ -510,7 +510,6 @@ static void wpa_supplicant_process_1_of_4(struct wpa_sm *sm, + os_memset(buf, 0, sizeof(buf)); + } + sm->tptk_set = 1; +- sm->tk_to_set = 1; + + kde = sm->assoc_wpa_ie; + kde_len = sm->assoc_wpa_ie_len; +@@ -615,7 +614,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm, + enum wpa_alg alg; + const u8 *key_rsc; + +- if (!sm->tk_to_set) { ++ if (sm->ptk.installed) { + wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, + "WPA: Do not re-install same PTK to the driver"); + return 0; +@@ -659,7 +658,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm, + + /* TK is not needed anymore in supplicant */ + os_memset(sm->ptk.tk, 0, WPA_TK_MAX_LEN); +- sm->tk_to_set = 0; ++ sm->ptk.installed = 1; + + if (sm->wpa_ptk_rekey) { + eloop_cancel_timeout(wpa_sm_rekey_ptk, sm, NULL); +diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h +index 9a54631..41f371f 100644 +--- src/rsn_supp/wpa_i.h ++++ src/rsn_supp/wpa_i.h +@@ -24,7 +24,6 @@ struct wpa_sm { + struct wpa_ptk ptk, tptk; + int ptk_set, tptk_set; + unsigned int msg_3_of_4_ok:1; +- unsigned int tk_to_set:1; + u8 snonce[WPA_NONCE_LEN]; + u8 anonce[WPA_NONCE_LEN]; /* ANonce from the last 1/4 msg */ + int renew_snonce; +-- +2.7.4 + diff --git a/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch b/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch new file mode 100644 index 00000000000..e35692b1c03 --- /dev/null +++ b/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch @@ -0,0 +1,64 @@ +From 12fac09b437a1dc8a0f253e265934a8aaf4d2f8b Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Sun, 1 Oct 2017 12:32:57 +0300 +Subject: [PATCH 5/8] Fix PTK rekeying to generate a new ANonce + +The Authenticator state machine path for PTK rekeying ended up bypassing +the AUTHENTICATION2 state where a new ANonce is generated when going +directly to the PTKSTART state since there is no need to try to +determine the PMK again in such a case. This is far from ideal since the +new PTK would depend on a new nonce only from the supplicant. + +Fix this by generating a new ANonce when moving to the PTKSTART state +for the purpose of starting new 4-way handshake to rekey PTK. + +Signed-off-by: Jouni Malinen +--- + src/ap/wpa_auth.c | 24 +++++++++++++++++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c +index 707971d..bf10cc1 100644 +--- src/ap/wpa_auth.c ++++ src/ap/wpa_auth.c +@@ -1901,6 +1901,21 @@ SM_STATE(WPA_PTK, AUTHENTICATION2) + } + + ++static int wpa_auth_sm_ptk_update(struct wpa_state_machine *sm) ++{ ++ if (random_get_bytes(sm->ANonce, WPA_NONCE_LEN)) { ++ wpa_printf(MSG_ERROR, ++ "WPA: Failed to get random data for ANonce"); ++ sm->Disconnect = TRUE; ++ return -1; ++ } ++ wpa_hexdump(MSG_DEBUG, "WPA: Assign new ANonce", sm->ANonce, ++ WPA_NONCE_LEN); ++ sm->TimeoutCtr = 0; ++ return 0; ++} ++ ++ + SM_STATE(WPA_PTK, INITPMK) + { + u8 msk[2 * PMK_LEN]; +@@ -2458,9 +2473,12 @@ SM_STEP(WPA_PTK) + SM_ENTER(WPA_PTK, AUTHENTICATION); + else if (sm->ReAuthenticationRequest) + SM_ENTER(WPA_PTK, AUTHENTICATION2); +- else if (sm->PTKRequest) +- SM_ENTER(WPA_PTK, PTKSTART); +- else switch (sm->wpa_ptk_state) { ++ else if (sm->PTKRequest) { ++ if (wpa_auth_sm_ptk_update(sm) < 0) ++ SM_ENTER(WPA_PTK, DISCONNECTED); ++ else ++ SM_ENTER(WPA_PTK, PTKSTART); ++ } else switch (sm->wpa_ptk_state) { + case WPA_PTK_INITIALIZE: + break; + case WPA_PTK_DISCONNECT: +-- +2.7.4 + diff --git a/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch b/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch new file mode 100644 index 00000000000..18ca542274e --- /dev/null +++ b/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch @@ -0,0 +1,132 @@ +From 6c4bed4f47d1960ec04981a9d50e5076aea5223d Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Fri, 22 Sep 2017 11:03:15 +0300 +Subject: [PATCH 6/8] TDLS: Reject TPK-TK reconfiguration + +Do not try to reconfigure the same TPK-TK to the driver after it has +been successfully configured. This is an explicit check to avoid issues +related to resetting the TX/RX packet number. There was already a check +for this for TPK M2 (retries of that message are ignored completely), so +that behavior does not get modified. + +For TPK M3, the TPK-TK could have been reconfigured, but that was +followed by immediate teardown of the link due to an issue in updating +the STA entry. Furthermore, for TDLS with any real security (i.e., +ignoring open/WEP), the TPK message exchange is protected on the AP path +and simple replay attacks are not feasible. + +As an additional corner case, make sure the local nonce gets updated if +the peer uses a very unlikely "random nonce" of all zeros. + +Signed-off-by: Jouni Malinen +--- + src/rsn_supp/tdls.c | 38 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 36 insertions(+), 2 deletions(-) + +diff --git a/src/rsn_supp/tdls.c b/src/rsn_supp/tdls.c +index e424168..9eb9738 100644 +--- src/rsn_supp/tdls.c ++++ src/rsn_supp/tdls.c +@@ -112,6 +112,7 @@ struct wpa_tdls_peer { + u8 tk[16]; /* TPK-TK; assuming only CCMP will be used */ + } tpk; + int tpk_set; ++ int tk_set; /* TPK-TK configured to the driver */ + int tpk_success; + int tpk_in_progress; + +@@ -192,6 +193,20 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer) + u8 rsc[6]; + enum wpa_alg alg; + ++ if (peer->tk_set) { ++ /* ++ * This same TPK-TK has already been configured to the driver ++ * and this new configuration attempt (likely due to an ++ * unexpected retransmitted frame) would result in clearing ++ * the TX/RX sequence number which can break security, so must ++ * not allow that to happen. ++ */ ++ wpa_printf(MSG_INFO, "TDLS: TPK-TK for the peer " MACSTR ++ " has already been configured to the driver - do not reconfigure", ++ MAC2STR(peer->addr)); ++ return -1; ++ } ++ + os_memset(rsc, 0, 6); + + switch (peer->cipher) { +@@ -209,12 +224,15 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer) + return -1; + } + ++ wpa_printf(MSG_DEBUG, "TDLS: Configure pairwise key for peer " MACSTR, ++ MAC2STR(peer->addr)); + if (wpa_sm_set_key(sm, alg, peer->addr, -1, 1, + rsc, sizeof(rsc), peer->tpk.tk, key_len) < 0) { + wpa_printf(MSG_WARNING, "TDLS: Failed to set TPK to the " + "driver"); + return -1; + } ++ peer->tk_set = 1; + return 0; + } + +@@ -696,7 +714,7 @@ static void wpa_tdls_peer_clear(struct wpa_sm *sm, struct wpa_tdls_peer *peer) + peer->cipher = 0; + peer->qos_info = 0; + peer->wmm_capable = 0; +- peer->tpk_set = peer->tpk_success = 0; ++ peer->tk_set = peer->tpk_set = peer->tpk_success = 0; + peer->chan_switch_enabled = 0; + os_memset(&peer->tpk, 0, sizeof(peer->tpk)); + os_memset(peer->inonce, 0, WPA_NONCE_LEN); +@@ -1159,6 +1177,7 @@ skip_rsnie: + wpa_tdls_peer_free(sm, peer); + return -1; + } ++ peer->tk_set = 0; /* A new nonce results in a new TK */ + wpa_hexdump(MSG_DEBUG, "TDLS: Initiator Nonce for TPK handshake", + peer->inonce, WPA_NONCE_LEN); + os_memcpy(ftie->Snonce, peer->inonce, WPA_NONCE_LEN); +@@ -1751,6 +1770,19 @@ static int wpa_tdls_addset_peer(struct wpa_sm *sm, struct wpa_tdls_peer *peer, + } + + ++static int tdls_nonce_set(const u8 *nonce) ++{ ++ int i; ++ ++ for (i = 0; i < WPA_NONCE_LEN; i++) { ++ if (nonce[i]) ++ return 1; ++ } ++ ++ return 0; ++} ++ ++ + static int wpa_tdls_process_tpk_m1(struct wpa_sm *sm, const u8 *src_addr, + const u8 *buf, size_t len) + { +@@ -2004,7 +2036,8 @@ skip_rsn: + peer->rsnie_i_len = kde.rsn_ie_len; + peer->cipher = cipher; + +- if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0) { ++ if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0 || ++ !tdls_nonce_set(peer->inonce)) { + /* + * There is no point in updating the RNonce for every obtained + * TPK M1 frame (e.g., retransmission due to timeout) with the +@@ -2020,6 +2053,7 @@ skip_rsn: + "TDLS: Failed to get random data for responder nonce"); + goto error; + } ++ peer->tk_set = 0; /* A new nonce results in a new TK */ + } + + #if 0 +-- +2.7.4 + diff --git a/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch b/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch new file mode 100644 index 00000000000..0e53f52c510 --- /dev/null +++ b/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch @@ -0,0 +1,43 @@ +From 53c5eb58e95004f86e65ee9fbfccbc291b139057 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Fri, 22 Sep 2017 11:25:02 +0300 +Subject: [PATCH 7/8] WNM: Ignore WNM-Sleep Mode Response without pending + request + +Commit 03ed0a52393710be6bdae657d1b36efa146520e5 ('WNM: Ignore WNM-Sleep +Mode Response if WNM-Sleep Mode has not been used') started ignoring the +response when no WNM-Sleep Mode Request had been used during the +association. This can be made tighter by clearing the used flag when +successfully processing a response. This adds an additional layer of +protection against unexpected retransmissions of the response frame. + +Signed-off-by: Jouni Malinen +--- + wpa_supplicant/wnm_sta.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c +index 1b3409c..67a07ff 100644 +--- wpa_supplicant/wnm_sta.c ++++ wpa_supplicant/wnm_sta.c +@@ -260,7 +260,7 @@ static void ieee802_11_rx_wnmsleep_resp(struct wpa_supplicant *wpa_s, + + if (!wpa_s->wnmsleep_used) { + wpa_printf(MSG_DEBUG, +- "WNM: Ignore WNM-Sleep Mode Response frame since WNM-Sleep Mode has not been used in this association"); ++ "WNM: Ignore WNM-Sleep Mode Response frame since WNM-Sleep Mode operation has not been requested"); + return; + } + +@@ -299,6 +299,8 @@ static void ieee802_11_rx_wnmsleep_resp(struct wpa_supplicant *wpa_s, + return; + } + ++ wpa_s->wnmsleep_used = 0; ++ + if (wnmsleep_ie->status == WNM_STATUS_SLEEP_ACCEPT || + wnmsleep_ie->status == WNM_STATUS_SLEEP_EXIT_ACCEPT_GTK_UPDATE) { + wpa_printf(MSG_DEBUG, "Successfully recv WNM-Sleep Response " +-- +2.7.4 + diff --git a/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch b/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch new file mode 100644 index 00000000000..12cc6964026 --- /dev/null +++ b/srcpkgs/wpa_supplicant/patches/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch @@ -0,0 +1,82 @@ +From b372ab0b7daea719749194dc554b26e6367603f2 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Fri, 22 Sep 2017 12:06:37 +0300 +Subject: [PATCH 8/8] FT: Do not allow multiple Reassociation Response frames + +The driver is expected to not report a second association event without +the station having explicitly request a new association. As such, this +case should not be reachable. However, since reconfiguring the same +pairwise or group keys to the driver could result in nonce reuse issues, +be extra careful here and do an additional state check to avoid this +even if the local driver ends up somehow accepting an unexpected +Reassociation Response frame. + +Signed-off-by: Jouni Malinen +--- + src/rsn_supp/wpa.c | 3 +++ + src/rsn_supp/wpa_ft.c | 8 ++++++++ + src/rsn_supp/wpa_i.h | 1 + + 3 files changed, 12 insertions(+) + +diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c +index 0550a41..2a53c6f 100644 +--- src/rsn_supp/wpa.c ++++ src/rsn_supp/wpa.c +@@ -2440,6 +2440,9 @@ void wpa_sm_notify_disassoc(struct wpa_sm *sm) + #ifdef CONFIG_TDLS + wpa_tdls_disassoc(sm); + #endif /* CONFIG_TDLS */ ++#ifdef CONFIG_IEEE80211R ++ sm->ft_reassoc_completed = 0; ++#endif /* CONFIG_IEEE80211R */ + + /* Keys are not needed in the WPA state machine anymore */ + wpa_sm_drop_sa(sm); +diff --git a/src/rsn_supp/wpa_ft.c b/src/rsn_supp/wpa_ft.c +index 205793e..d45bb45 100644 +--- src/rsn_supp/wpa_ft.c ++++ src/rsn_supp/wpa_ft.c +@@ -153,6 +153,7 @@ static u8 * wpa_ft_gen_req_ies(struct wpa_sm *sm, size_t *len, + u16 capab; + + sm->ft_completed = 0; ++ sm->ft_reassoc_completed = 0; + + buf_len = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) + + 2 + sm->r0kh_id_len + ric_ies_len + 100; +@@ -681,6 +682,11 @@ int wpa_ft_validate_reassoc_resp(struct wpa_sm *sm, const u8 *ies, + return -1; + } + ++ if (sm->ft_reassoc_completed) { ++ wpa_printf(MSG_DEBUG, "FT: Reassociation has already been completed for this FT protocol instance - ignore unexpected retransmission"); ++ return 0; ++ } ++ + if (wpa_ft_parse_ies(ies, ies_len, &parse) < 0) { + wpa_printf(MSG_DEBUG, "FT: Failed to parse IEs"); + return -1; +@@ -781,6 +787,8 @@ int wpa_ft_validate_reassoc_resp(struct wpa_sm *sm, const u8 *ies, + return -1; + } + ++ sm->ft_reassoc_completed = 1; ++ + if (wpa_ft_process_gtk_subelem(sm, parse.gtk, parse.gtk_len) < 0) + return -1; + +diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h +index 41f371f..56f88dc 100644 +--- src/rsn_supp/wpa_i.h ++++ src/rsn_supp/wpa_i.h +@@ -128,6 +128,7 @@ struct wpa_sm { + size_t r0kh_id_len; + u8 r1kh_id[FT_R1KH_ID_LEN]; + int ft_completed; ++ int ft_reassoc_completed; + int over_the_ds_in_progress; + u8 target_ap[ETH_ALEN]; /* over-the-DS target AP */ + int set_ptk_after_assoc; +-- +2.7.4 + diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template index c412e197ddf..9404b4e6037 100644 --- a/srcpkgs/wpa_supplicant/template +++ b/srcpkgs/wpa_supplicant/template @@ -1,7 +1,7 @@ # Template file for 'wpa_supplicant' pkgname=wpa_supplicant version=2.6 -revision=6 +revision=7 build_wrksrc=$pkgname short_desc="WPA/WPA2/IEEE 802.1X Supplicant" maintainer="Juan RP " diff --git a/srcpkgs/xcursor-vanilla-dmz-aa/template b/srcpkgs/xcursor-vanilla-dmz-aa/template new file mode 100644 index 00000000000..19ca82f1bc4 --- /dev/null +++ b/srcpkgs/xcursor-vanilla-dmz-aa/template @@ -0,0 +1,24 @@ +# Template file for 'xcursor-vanilla-dmz-aa' +pkgname=xcursor-vanilla-dmz-aa +version=0.4.4 +revision=1 +noarch=yes +build_style=fetch +hostmakedepends="xcursorgen" +short_desc="Vanilla DMZ AA cursor theme" +maintainer="Jerry Tegno " +license="CCPL:by-nc-sa" +homepage="http://jimmac.musichall.cz/" +distfiles="${DEBIAN_SITE}/main/d/dmz-cursor-theme/dmz-cursor-theme_${version}.tar.gz" +checksum=46af4cf1356df799f9ee94451f05d0bdbb8d82e54bdeae3f32fa107602359981 + +do_install() { + tar xzf dmz-cursor-theme_${version}.tar.gz + cd dmz-cursor-theme-${version} + (cd DMZ-Black/pngs ; ./make.sh) + + vmkdir /usr/share/icons + vmkdir /usr/share/icons/Vanilla-DMZ-AA/cursors + vcopy DMZ-Black/xcursors/* /usr/share/icons/Vanilla-DMZ-AA/cursors + vinstall DMZ-Black/index.theme 644 /usr/share/icons/Vanilla-DMZ-AA/index.theme +} diff --git a/srcpkgs/xcursor-vanilla-dmz/template b/srcpkgs/xcursor-vanilla-dmz/template new file mode 100644 index 00000000000..975de0e98cb --- /dev/null +++ b/srcpkgs/xcursor-vanilla-dmz/template @@ -0,0 +1,24 @@ +# Template file for 'xcursor-vanilla-dmz' +pkgname=xcursor-vanilla-dmz +version=0.4.4 +revision=1 +noarch=yes +build_style=fetch +hostmakedepends="xcursorgen" +short_desc="Vanilla DMZ cursor theme" +maintainer="Jerry Tegno " +license="CCPL:by-nc-sa" +homepage="http://jimmac.musichall.cz/" +distfiles="${DEBIAN_SITE}/main/d/dmz-cursor-theme/dmz-cursor-theme_${version}.tar.gz" +checksum=46af4cf1356df799f9ee94451f05d0bdbb8d82e54bdeae3f32fa107602359981 + +do_install() { + tar xzf dmz-cursor-theme_${version}.tar.gz + cd dmz-cursor-theme-${version} + (cd DMZ-White/pngs ; ./make.sh) + + vmkdir /usr/share/icons + vmkdir /usr/share/icons/Vanilla-DMZ/cursors + vcopy DMZ-White/xcursors/* /usr/share/icons/Vanilla-DMZ/cursors + vinstall DMZ-White/index.theme 644 /usr/share/icons/Vanilla-DMZ/index.theme +} diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template index d3fc5df3eb8..723cdd648e6 100644 --- a/srcpkgs/xfce4-pulseaudio-plugin/template +++ b/srcpkgs/xfce4-pulseaudio-plugin/template @@ -1,17 +1,18 @@ # Template file for 'xfce4-pulseaudio-plugin' pkgname=xfce4-pulseaudio-plugin -version=0.2.5 +version=0.3.1 revision=1 build_style=gnu-configure hostmakedepends="gettext-devel glib-devel intltool pkg-config xfce4-dev-tools" makedepends="libnotify-devel libxfce4ui-devel pulseaudio-devel xfce4-panel-devel libkeybinder3-devel" +depends="pavucontrol" short_desc="Pulseaudio volume control plugin for Xfce4 panel" maintainer="Steve Prybylski " license="GPL-2" homepage="http://git.xfce.org/panel-plugins/xfce4-pulseaudio-plugin" distfiles="http://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=087441331240f8fca6cbcc2839251ad7e8d624fed7b4b7b4cd4e6938cb26c0b2 +checksum=61a39f892e5e06723a08f919682362ebaf54792ed1076f5be828d0209a52f482 pre_configure() { NOCONFIGURE=1 xdt-autogen diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template index cef64ff145b..3008c8263ef 100644 --- a/srcpkgs/xfce4-weather-plugin/template +++ b/srcpkgs/xfce4-weather-plugin/template @@ -1,6 +1,6 @@ # Template file for 'xfce4-weather-plugin' pkgname=xfce4-weather-plugin -version=0.8.9 +version=0.8.10 revision=1 lib32disabled=yes build_style=gnu-configure @@ -13,4 +13,4 @@ maintainer="Juan RP " homepage="http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin" license="GPL-2" distfiles="http://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=0e15d14b3e18c3da46ad23ee3158a25220f1474a48b611de96edb56221aecee5 +checksum=ee6d43c444904631c240470e15e96215c2ce451158bfdbf234bce892bf60eab8 diff --git a/srcpkgs/xiate/template b/srcpkgs/xiate/template index 7e065781c74..7d87b2f3443 100644 --- a/srcpkgs/xiate/template +++ b/srcpkgs/xiate/template @@ -1,6 +1,6 @@ # Template file for 'xiate' pkgname=xiate -version=17.09 +version=17.10 revision=1 build_style=gnu-makefile hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ maintainer="Diogo Leal " license="MIT" homepage="https://github.com/vain/xiate" distfiles="https://github.com/vain/xiate/archive/v${version}.tar.gz" -checksum=4a8d5162e9fa5392c60fca58e3e50d0b653c1e3d0d7e6950f218d3c037547747 +checksum=b234a4e60ee7979f9e834158c616669575d0edb244dc355c4043845f9251d088 pre_configure() { cp config.def.h config.h diff --git a/srcpkgs/xkcdpass/template b/srcpkgs/xkcdpass/template new file mode 100644 index 00000000000..37ae056e43d --- /dev/null +++ b/srcpkgs/xkcdpass/template @@ -0,0 +1,20 @@ +# Template file for 'xkcdpass' +pkgname=xkcdpass +version=1.13.0 +revision=1 +noarch=yes +build_style=python3-module +pycompile_module="xkcdpass" +hostmakedepends="python3-setuptools" +depends="python3-setuptools" +maintainer="cr6git " +short_desc="Generate secure multiword passwords/passphrases, inspired by XKCD" +homepage="https://github.com/redacted/XKCD-password-generator" +license="BSD" +distfiles="https://github.com/redacted/XKCD-password-generator/archive/xkcdpass-${version}.tar.gz" +checksum=fc220a04a5290c57f5b558144fe7e12433fbfb6c273809727f971e73433edcbb +wrksrc="XKCD-password-generator-xkcdpass-${version}" + +post_install() { + vlicense LICENSE.BSD +} diff --git a/srcpkgs/xlockmore/template b/srcpkgs/xlockmore/template index c79044b7c48..9e9714bff22 100644 --- a/srcpkgs/xlockmore/template +++ b/srcpkgs/xlockmore/template @@ -1,7 +1,7 @@ # Template file for 'xlockmore' pkgname=xlockmore version=5.55 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="freetype-devel libXt-devel libXext-devel" @@ -21,4 +21,7 @@ do_install() { bindir=${DESTDIR}/usr/bin mandir=${DESTDIR}/usr/share/man/man1 \ prefix=${DESTDIR}/usr install chmod u+s ${DESTDIR}/usr/bin/xlock + + sed -n 56,74p xlock/xlock.h > LICENSE + vlicense LICENSE } diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template index ca8aeb1aed5..3238a759d8c 100644 --- a/srcpkgs/xmlsec1/template +++ b/srcpkgs/xmlsec1/template @@ -1,7 +1,7 @@ # Template file for 'xmlsec' pkgname=xmlsec1 version=1.2.25 -revision=1 +revision=2 hostmakedepends="automake libtool pkg-config gnutls-devel" makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel" build_style="gnu-configure" @@ -20,6 +20,8 @@ post_install() { if [ "$CROSS_BUILD" ]; then sed -e "s,${XBPS_CROSS_BASE},,g" -i ${DESTDIR}/usr/lib/xmlsec1Conf.sh fi + + vlicense COPYING } xmlsec1-devel_package() { diff --git a/srcpkgs/xorriso/template b/srcpkgs/xorriso/template index ecf5f8dc604..b7173e88193 100644 --- a/srcpkgs/xorriso/template +++ b/srcpkgs/xorriso/template @@ -1,6 +1,6 @@ # Template file for 'xorriso' pkgname=xorriso -version=1.4.8 +version=1.4.9 revision=1 build_style=gnu-configure makedepends="zlib-devel bzip2-devel readline-devel acl-devel" @@ -9,4 +9,4 @@ maintainer="Juan RP " license="GPL-3" homepage="https://www.gnu.org/software/xorriso" distfiles="https://www.gnu.org/software/xorriso/xorriso-$version.tar.gz" -checksum=ec82069e04096cd9c18be9b12b87b750ade0b5e37508978feabcde36b2278481 +checksum=7db64414f2afaf14fe8957e343b05ec4c4c2f55c9bb798e7f1491592366c9320 diff --git a/srcpkgs/xst/INSTALL b/srcpkgs/xst/INSTALL new file mode 100644 index 00000000000..543529476d8 --- /dev/null +++ b/srcpkgs/xst/INSTALL @@ -0,0 +1,5 @@ +case "${ACTION}" in +post) + tic -s usr/share/terminfo/s/st.terminfo + ;; +esac diff --git a/srcpkgs/xst/REMOVE b/srcpkgs/xst/REMOVE new file mode 100644 index 00000000000..6911eb3e614 --- /dev/null +++ b/srcpkgs/xst/REMOVE @@ -0,0 +1,8 @@ +case "${ACTION}" in +pre) + rm usr/share/terminfo/s/st + rm usr/share/terminfo/s/st-meta + rm usr/share/terminfo/s/st-meta-256color + rm usr/share/terminfo/s/st-256color + ;; +esac diff --git a/srcpkgs/xst/template b/srcpkgs/xst/template new file mode 100644 index 00000000000..190fbe5ea23 --- /dev/null +++ b/srcpkgs/xst/template @@ -0,0 +1,27 @@ +# Template file for 'xst' +pkgname=xst +version=0.7.1 +revision=1 +build_style=gnu-makefile +make_use_env=compliant +hostmakedepends="pkg-config" +makedepends="libXft-devel libXext-devel fontconfig-devel" +depends="ncurses" +conflicts="st" +short_desc="St fork with support for xresources" +maintainer="maxice8 " +license="MIT" +homepage="https://github.com/neeasade/xst" +distfiles="https://github.com/neeasade/xst/archive/v${version}.tar.gz" +checksum=f8d8de99f48c63f9a68a2d68e7de03a26aad9729c27ae3ce345ab8514ee85ea5 + +do_install() { + vbin st + vman doc/st.1 + + vinstall doc/st.info 644 usr/share/terminfo/s st.terminfo + vdoc README.md README + vdoc doc/FAQ + vdoc doc/Xresources + vlicense doc/LICENSE +} diff --git a/srcpkgs/xvkbd/template b/srcpkgs/xvkbd/template index 0f7cca5dc1e..c7bec09bc30 100644 --- a/srcpkgs/xvkbd/template +++ b/srcpkgs/xvkbd/template @@ -13,12 +13,12 @@ distfiles="http://t-sato.in.coocan.jp/${pkgname}/${pkgname}-${version}.tar.gz" checksum=895f768269820e7c0379b0daac3687bda0c670d192ebb7e61e5613a5939ec90b nocross=yes # xmkmf broken -do_configure() { - xmkmf +do_configure() { + xmkmf } pre_build() { - export MODULE_CFLAGS="$CFLAGS" - export LOCAL_LDFLAGS="$LDFLAGS" + export MODULE_CFLAGS="$CFLAGS" + export LOCAL_LDFLAGS="$LDFLAGS" } post_install() { rm ${DESTDIR}/usr/lib/X11/app-defaults diff --git a/srcpkgs/xwallpaper/template b/srcpkgs/xwallpaper/template new file mode 100644 index 00000000000..aa9f2217138 --- /dev/null +++ b/srcpkgs/xwallpaper/template @@ -0,0 +1,22 @@ +# Template file for 'xwallpaper' +pkgname=xwallpaper +version=0.3.0 +revision=1 +build_style=gnu-configure +hostmakedepends="automake pkg-config" +makedepends="libjpeg-turbo-devel libpng-devel libseccomp-devel + libXpm-devel pixman-devel xcb-util-image-devel" +maintainer="cr6git " +short_desc="Wallpaper setting utility for X" +homepage="https://github.com/stoeckmann/xwallpaper" +license="ISC" +distfiles="https://github.com/stoeckmann/xwallpaper/archive/v${version}.tar.gz" +checksum=41939faf7b2ef9286e3985fbd6147ce74ec1398c11ec851454adbef5a36e96c5 + +pre_configure() { + autoreconf -fiv +} + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/yarn-bin/template b/srcpkgs/yarn-bin/template index 0f49ebd3bca..4dc0eb4a4d6 100644 --- a/srcpkgs/yarn-bin/template +++ b/srcpkgs/yarn-bin/template @@ -1,6 +1,6 @@ # Template file for 'yarn-bin' pkgname=yarn-bin -version=1.0.2 +version=1.1.0 revision=1 depends="nodejs" short_desc="Fast, reliable, and secure dependency management - precompiled binaries" @@ -9,7 +9,7 @@ license="2-cause-BSD" homepage="https://yarnpkg.com/" distfiles="https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz" conflicts="yarn>=0" -checksum=8a31f8fa50ab6d5f8852025fb0ea4a50f2f8b82792f060fa99de0acc370b0698 +checksum=171c1f9ee93c488c0d774ac6e9c72649047c3f896277d88d0f805266519430f3 do_extract() { tar xfz ${XBPS_SRCDISTDIR}/${pkgname}-${version}/yarn-v${version}.tar.gz --strip-components=1 -C ${wrksrc} diff --git a/srcpkgs/yarn/template b/srcpkgs/yarn/template index 72f627160bb..e131851d163 100644 --- a/srcpkgs/yarn/template +++ b/srcpkgs/yarn/template @@ -1,6 +1,6 @@ # Template file for 'yarn' pkgname=yarn -version=1.0.2 +version=1.1.0 revision=1 hostmakedepends="yarn-bin" depends="nodejs" @@ -10,7 +10,7 @@ license="2-cause-BSD" homepage="https://yarnpkg.com/" distfiles="https://github.com/yarnpkg/${pkgname}/archive/v${version}.tar.gz" conflicts="yarn-bin>=0" -checksum=da7ba9013a272a135543243c4e171f50f1199934fa04a339a8d1245ce92a4419 +checksum=422d24688d7e008717af84b4df14df50bd207faa8dc0cdccb779ea5a1477b5d6 pre_build() { yarn diff --git a/srcpkgs/yoshimi/template b/srcpkgs/yoshimi/template index 3df321ec3bf..aa5234450be 100644 --- a/srcpkgs/yoshimi/template +++ b/srcpkgs/yoshimi/template @@ -1,6 +1,6 @@ # Template file for 'yoshimi' pkgname=yoshimi -version=1.5.4 +version=1.5.4.1 revision=1 build_style=cmake build_wrksrc=src @@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://yoshimi.sourceforge.net" distfiles="https://github.com/Yoshimi/$pkgname/archive/$version.tar.gz" -checksum=c5dba1f0d71deb2c3a9fc9d6f06e848d5cb218dc6bec0ba709979508be2572bd +checksum=447ea507177d59b090f9ef54c3318cf33ba512df95863a888637b494def4c445 case "$XBPS_TARGET_MACHINE" in *-musl) broken="https://build.voidlinux.eu/builders/armv6l-musl_builder/builds/10648/steps/shell_3/logs/stdio";; diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template index cb01540028e..9fa56186895 100644 --- a/srcpkgs/youtube-dl/template +++ b/srcpkgs/youtube-dl/template @@ -1,6 +1,6 @@ # Template file for 'youtube-dl' pkgname=youtube-dl -version=2017.10.12 +version=2017.10.15.1 revision=1 noarch=yes wrksrc="${pkgname}" @@ -14,7 +14,7 @@ maintainer="Juan RP " homepage="http://rg3.github.com/youtube-dl/" license="Public Domain" distfiles="https://yt-dl.org/downloads/${version}/${pkgname}-${version}.tar.gz" -checksum=abbfd0f4c941a85fd26af074a026dd1f4e366b385463fd23ef20432e2b2890ac +checksum=da6ae68b2fbe81da7cf4ac6b989fa7bf27b3beb214eed551d466cc6e41d7297f alternatives="youtube-dl:youtube-dl:/usr/bin/youtube-dl2" post_install() { diff --git a/srcpkgs/zfs-auto-snapshot/template b/srcpkgs/zfs-auto-snapshot/template index 682c77263c3..de958886cd0 100644 --- a/srcpkgs/zfs-auto-snapshot/template +++ b/srcpkgs/zfs-auto-snapshot/template @@ -1,6 +1,6 @@ # Template file for 'zfs-auto-snapshot' pkgname=zfs-auto-snapshot -version=1.2.1 +version=1.2.4 revision=1 wrksrc="${pkgname}-upstream-${version}" build_style=gnu-makefile @@ -9,7 +9,7 @@ license="GPL-2" homepage="https://github.com/zfsonlinux/zfs-auto-snapshot" short_desc="ZFS automatic snapshot service" distfiles="${homepage}/archive/upstream/${version}.tar.gz" -checksum=ecf6f43accfa191758960660fc6e014898209070e722a38535783b96d319f401 +checksum=307f71f748cacf5149532891dc3174365a4494337d9cfc8e619d9038080f3e9b noarch=yes post_install() { diff --git a/srcpkgs/zsh-completions/template b/srcpkgs/zsh-completions/template index dbaab1906e3..8ef392b19b3 100644 --- a/srcpkgs/zsh-completions/template +++ b/srcpkgs/zsh-completions/template @@ -1,6 +1,6 @@ # Template file for 'zsh-completions' pkgname=zsh-completions -version=0.25.0 +version=0.27.0 revision=1 noarch=yes depends="zsh" @@ -9,7 +9,7 @@ maintainer="Alexander Gehrke " license="BSD, Apache-2.0, MIT" homepage="https://github.com/zsh-users/zsh-completions" distfiles="${homepage}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=6a89fb148313577ea81a36630bc2bf009aaaf74a116109cb33f422396e23ab0f +checksum=9b817b73e709aca0e7e5a41471b5b63467d1e7aa69ef755b6ce39b99e61cd47a do_install() { vmkdir usr/share/zsh/site-functions/