diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index ad81959..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,79 +0,0 @@ -version: 2 -jobs: - build: - machine: true - - working_directory: ~/repo - - steps: - - checkout - - - run: - name: Install flathub SDK - command: | - docker run --privileged --volume "${PWD}":/tmp/sdk/ --name fb -it -d flatpak/flatpak-builder:base /bin/bash - docker exec -it fb bash -c 'flatpak install flathub org.freedesktop.Sdk/i386/1.6 && - flatpak install flathub org.freedesktop.Sdk/x86_64/1.6 && - flatpak install flathub org.freedesktop.Platform/i386/1.6 && - flatpak install flathub org.freedesktop.Platform/x86_64/1.6' - - - run: - name: Setup winepak repo - command: | - docker exec -it fb bash -c 'cd /tmp/sdk/ && flatpak remote-add --no-gpg-verify winepak winepak-repo' - - - run: - name: Build org.winepak.Sdk/i386/3.0 - command: | - docker exec -it fb bash -c 'cd /tmp/sdk && flatpak-builder \ - --arch=i386 \ - --ccache \ - --force-clean \ - --repo=winepak-repo \ - winepak-build \ - org.winepak.Sdk.yml' - - run: - name: Build org.winepak.Sdk/x86_64/3.0 - command: | - docker exec -it fb bash -c 'cd /tmp/sdk && flatpak-builder \ - --arch=x86_64 \ - --ccache \ - --force-clean \ - --repo=winepak-repo \ - winepak-build \ - org.winepak.Sdk.yml' - - run: - name: Build org.winepak.Platform.Compat32/x86_64/3.0 - command: | - docker exec -it fb bash -c 'cd /tmp/sdk && flatpak build-commit-from \ - --src-ref=runtime/org.winepak.Platform/i386/3.0 \ - winepak-repo \ - runtime/org.winepak.Platform.Compat32/x86_64/3.0' - - run: - name: Build org.winepak.Platform.Wine/i386/3.8-staging - command: | - docker exec -it fb bash -c 'cd /tmp/sdk && flatpak-builder \ - --arch=i386 \ - --ccache \ - --force-clean \ - --repo=winepak-repo \ - winepak-build \ - wine/3.8-staging/org.winepak.Platform.Wine.yml' - - run: - name: Build org.winepak.Platform.Wine/x86_64/3.8-staging - command: | - docker exec -it fb bash -c 'cd /tmp/sdk && flatpak-builder \ - --arch=x86_64 \ - --ccache \ - --force-clean \ - --repo=winepak-repo \ - winepak-build \ - wine/3.8-staging/org.winepak.Platform.Wine.yml' - - run: - name: Build org.winepak.Platform.Wine.Compat32/x86_64/3.8-staging - command: | - docker exec -it fb bash -c 'cd /tmp/sdk && flatpak build-commit-from \ - --src-ref=runtime/org.winepak.Platform.Wine/i386/3.8-staging \ - winepak-repo \ - runtime/org.winepak.Platform.Wine.Compat32/x86_64/3.8-staging' - diff --git a/.gitignore b/.gitignore index fa26ad6..2f1912f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +.circleci .flatpak-builder builds winepak +winepak-repo diff --git a/extension/org.winepak.Platform.Extension.cabextract.metainfo.xml b/extension/org.winepak.Platform.Extension.cabextract.metainfo.xml new file mode 100644 index 0000000..2ecd9ff --- /dev/null +++ b/extension/org.winepak.Platform.Extension.cabextract.metainfo.xml @@ -0,0 +1,9 @@ + + + org.winepak.Platform.Extension.cabextract + org.winepak.Platform.desktop + CC0-1.0 + LicenseRef-proprietary + cabextract + Add cabextract to an application + diff --git a/extension/org.winepak.Platform.Extension.cabextract.yml b/extension/org.winepak.Platform.Extension.cabextract.yml new file mode 100644 index 0000000..440befd --- /dev/null +++ b/extension/org.winepak.Platform.Extension.cabextract.yml @@ -0,0 +1,28 @@ +build-extension: true + +id: org.winepak.Platform.Extension.cabextract +branch: 1.6 + +runtime: org.winepak.Platform +runtime-version: 3.0 +sdk: org.winepak.Sdk + +separate-locales: false +appstream-compose: false + +modules: + - name: cabextract + buildsystem: autotools + sources: + - type: archive + url: https://www.cabextract.org.uk/cabextract-1.6.tar.gz + sha256: cee661b56555350d26943c5e127fc75dd290b7f75689d5ebc1f04957c4af55fb + + - name: metainfo + buildsystem: simple + build-commands: + - install -Dm644 --target-directory=${FLATPAK_DEST}/share/metainfo org.winepak.Platform.Extension.cabextract.metainfo.xml + - appstream-compose --basename=org.winepak.Platform.Extension.cabextract --prefix=${FLATPAK_DEST} --origin=flatpak org.winepak.Platform.Extension.cabextract + sources: + - type: file + path: org.winepak.Platform.Extension.cabextract.metainfo.xml diff --git a/extension/org.winepak.Platform.Extension.libtxc_dxtn.metainfo.xml b/extension/org.winepak.Platform.Extension.libtxc_dxtn.metainfo.xml new file mode 100644 index 0000000..f3cd651 --- /dev/null +++ b/extension/org.winepak.Platform.Extension.libtxc_dxtn.metainfo.xml @@ -0,0 +1,9 @@ + + + org.winepak.Platform.Extension.libtxc_dxtn + org.winepak.Platform.desktop + CC0-1.0 + MIT licensed + Libtxc_dtn + S3TC with DRI drivers + diff --git a/extension/org.winepak.Platform.Extension.libtxc_dxtn.yml b/extension/org.winepak.Platform.Extension.libtxc_dxtn.yml new file mode 100644 index 0000000..c3bab1e --- /dev/null +++ b/extension/org.winepak.Platform.Extension.libtxc_dxtn.yml @@ -0,0 +1,51 @@ +uild-extension: true + +id: org.winepak.Platform.Extension.libtxc_dxtn +branch: 3.0 + +runtime: org.winepak.Platform +runtime-version: 3.0 +sdk: org.winepak.Sdk + +separate-locales: false +appstream-compose: false + +modules: + - name: libtxc_dxtn-win64 + only-arches: + - x86_64 + config-opts: + - --disable-static + - --enable-shared + sources: + - type: archive + url: https://people.freedesktop.org/~cbrill/libtxc_dxtn/libtxc_dxtn-1.0.1.tar.bz2 + sha256: 45290d12cdca529a3f41e7fc35c4250fc1b6d2fc16b56680f8401f6aa792ae60 + + cleanup: + - /include + - /share/man + + - name: libtxc_dxtn-win32 + only-arches: + - i386 + config-opts: + - --disable-static + - --enable-shared + sources: + - type: archive + url: https://people.freedesktop.org/~cbrill/libtxc_dxtn/libtxc_dxtn-1.0.1.tar.bz2 + sha256: 45290d12cdca529a3f41e7fc35c4250fc1b6d2fc16b56680f8401f6aa792ae60 + + cleanup: + - /include + - /share/man + + - name: metainfo + buildsystem: simple + build-commands: + - install -Dm644 --target-directory=${FLATPAK_DEST}/share/metainfo/ org.winepak.Platform.Extension.libtxc_dxtn.metainfo.xml + - appstream-compose --basename=org.winepak.Platform.Extension.libtxc_dxtn --prefix=${FLATPAK_DEST} --origin=flatpak org.winepak.Platform.Extension.libtxc_dxtn + sources: + - type: file + path: org.winepak.Platform.Extension.libtxc_dxtn.metainfo.xml diff --git a/extension/org.winepak.Platform.Extension.mono.metainfo.xml b/extension/org.winepak.Platform.Extension.mono.metainfo.xml new file mode 100644 index 0000000..421cdbd --- /dev/null +++ b/extension/org.winepak.Platform.Extension.mono.metainfo.xml @@ -0,0 +1,9 @@ + + + org.winepak.Platform.Extension.mono + org.winepak.Platform.desktop + CC0-1.0 + LicenseRef-proprietary + mono + Add mono the opensource dot.net replacment to an application + diff --git a/extension/org.winepak.Platform.Extension.mono.xml b/extension/org.winepak.Platform.Extension.mono.xml new file mode 100644 index 0000000..870992d --- /dev/null +++ b/extension/org.winepak.Platform.Extension.mono.xml @@ -0,0 +1,9 @@ + + + org.winepak.Platform.Extension.wine_gecko + org.winepak.Platform.desktop + CC0-1.0 + LicenseRef-proprietary + wine_gecko + Add mozilla gecko engine to an application + diff --git a/extension/org.winepak.Platform.Extension.mono.yml b/extension/org.winepak.Platform.Extension.mono.yml new file mode 100644 index 0000000..e239355 --- /dev/null +++ b/extension/org.winepak.Platform.Extension.mono.yml @@ -0,0 +1,31 @@ +build-extension: true + +id: org.winepak.Platform.Extension.mono +branch: 4.7.1 + +runtime: org.winepak.Platform +runtime-version: 3.0 +sdk: org.winepak.Sdk + +separate-locales: false +appstream-compose: false + +modules: + - name: wine-mono + buildsystem: simple + build-commands: + - install -D --target-directory=/usr/share/wine/mono/ wine-mono-*.msi + no-make-install: true + sources: + - type: file + url: https://dl.winehq.org/wine/wine-mono/4.7.1/wine-mono-4.7.1.msi + sha256: 2c8d5db7f833c3413b2519991f5af1f433d59a927564ec6f38a3f1f8b2c629aa + + - name: metainfo + buildsystem: simple + build-commands: + - install -Dm644 --target-directory=${FLATPAK_DEST}/share/metainfo org.winepak.Platform.Extension.mono.metainfo.xml + - appstream-compose --basename=org.winepak.Platform.Extension.mono --prefix=${FLATPAK_DEST} --origin=flatpak org.winepak.Platform.Extension.mono + sources: + - type: file + path: org.winepak.Platform.Extension.mono.metainfo.xml diff --git a/extension/org.winepak.Platform.Extension.wine_gecko.metainfo.xml b/extension/org.winepak.Platform.Extension.wine_gecko.metainfo.xml new file mode 100644 index 0000000..870992d --- /dev/null +++ b/extension/org.winepak.Platform.Extension.wine_gecko.metainfo.xml @@ -0,0 +1,9 @@ + + + org.winepak.Platform.Extension.wine_gecko + org.winepak.Platform.desktop + CC0-1.0 + LicenseRef-proprietary + wine_gecko + Add mozilla gecko engine to an application + diff --git a/extension/org.winepak.Platform.Extension.wine_gecko.yml b/extension/org.winepak.Platform.Extension.wine_gecko.yml new file mode 100644 index 0000000..16168bb --- /dev/null +++ b/extension/org.winepak.Platform.Extension.wine_gecko.yml @@ -0,0 +1,36 @@ +build-extension: true + +id: org.winepak.Platform.Extension.wine_gecko +branch: 2.47 + +runtime: org.winepak.Platform +runtime-version: 3.0 +sdk: org.winepak.Sdk + +separate-locales: false +appstream-compose: false + +modules: + - name: wine-gecko + buildsystem: simple + build-commands: + - install -D --target-directory=/usr/share/wine/gecko/ wine_gecko-*.msi + no-make-install: true + sources: + - type: file + only-arches: + - x86_64 + url: https://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86_64.msi + sha256: c565ea25e50ea953937d4ab01299e4306da4a556946327d253ea9b28357e4a7d + - type: file + url: https://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86.msi + sha256: 3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a + + - name: metainfo + buildsystem: simple + build-commands: + - install -Dm644 --target-directory=${FLATPAK_DEST}/share/metainfo org.winepak.Platform.Extension.wine_gecko.metainfo.xml + - appstream-compose --basename=org.winepak.Platform.Extension.wine_gecko --prefix=${FLATPAK_DEST} --origin=flatpak org.winepak.Platform.Extension.wine_gecko + sources: + - type: file + path: org.winepak.Platform.Extension.wine_gecko.metainfo.xml diff --git a/extension/org.winepak.Platform.Extension.winetricks.metainfo.xml b/extension/org.winepak.Platform.Extension.winetricks.metainfo.xml new file mode 100644 index 0000000..03afaed --- /dev/null +++ b/extension/org.winepak.Platform.Extension.winetricks.metainfo.xml @@ -0,0 +1,9 @@ + + + org.winepak.Platform.Extension.winetricks + org.winepak.Platform.desktop + CC0-1.0 + LicenseRef-proprietary + wine_gecko + Add winetricks to an application + diff --git a/extension/org.winepak.Platform.Extension.winetricks.yml b/extension/org.winepak.Platform.Extension.winetricks.yml new file mode 100644 index 0000000..4a77c17 --- /dev/null +++ b/extension/org.winepak.Platform.Extension.winetricks.yml @@ -0,0 +1,31 @@ +build-extension: true + +id: org.winepak.Platform.Extension.winetricks +branch: 20180815 + +runtime: org.winepak.Platform +runtime-version: 3.0 +sdk: org.winepak.Sdk + +separate-locales: false +appstream-compose: false + +modules: + - name: winetricks + buildsystem: simple + build-commands: + - make + - make install + sources: + - type: archive + url: https://github.com/Winetricks/winetricks/archive/20180815.tar.gz + sha256: 6dc22357ea1f857b7283250f7c6a68b9dee97e672bbea9a9c45c573d73634200 + + - name: metainfo + buildsystem: simple + build-commands: + - install -Dm644 --target-directory=${FLATPAK_DEST}/share/metainfo org.winepak.Platform.Extension.winetricks.metainfo.xml + - appstream-compose --basename=org.winepak.Platform.Extension.winetricks --prefix=${FLATPAK_DEST} --origin=flatpak org.winepak.Platform.Extension.winetricks + sources: + - type: file + path: org.winepak.Platform.Extension.winetricks.metainfo.xml diff --git a/org.winepak.Sdk.yml b/org.winepak.Sdk.yml index c879f07..f59dbc1 100644 --- a/org.winepak.Sdk.yml +++ b/org.winepak.Sdk.yml @@ -52,8 +52,10 @@ add-extensions: autodelete: true no-autodownload: true -platform-extensions: - - org.freedesktop.Platform.Locale +# commandline says "built from org.freedesktop.Platform.Locale +# removed for now otherwise it doens't built at all +# platform-extensions: +# - org.freedesktop.Platform.Locale inherit-extensions: - org.freedesktop.Platform.GL @@ -168,108 +170,6 @@ modules: commands: - "./dist/configure $@" - - name: wine-win64 - only-arches: - - x86_64 - config-opts: - - --enable-win64 - - --disable-win16 - - --disable-tests - - --with-x - - --with-ldap - - --without-cups - - --without-curses - - --without-capi - - --without-glu - - --without-gphoto - - --without-gsm - - --without-hal - - --without-netapi - - --without-opencl - - --without-pcap - - --without-udev - - --without-v4l - cleanup: - - /share/man - - /share/applications - sources: - - type: archive - url: https://dl.winehq.org/wine/source/3.0/wine-3.0.1.tar.xz - sha256: bad00d7ddac6652795a2ed52ce02a544ff4e891499b29ac71d28d20b8e1d26f3 - - - name: wine-win32 - only-arches: - - i386 - config-opts: - - --disable-win64 - - --disable-win16 - - --disable-tests - - --with-x - - --with-ldap - - --without-cups - - --without-curses - - --without-capi - - --without-glu - - --without-gphoto - - --without-gsm - - --without-hal - - --without-netapi - - --without-opencl - - --without-pcap - - --without-udev - - --without-v4l - cleanup: - - /bin/function_grep.pl - - /include - - /share/man - - /share/applications - sources: - - type: archive - url: https://dl.winehq.org/wine/source/3.0/wine-3.0.1.tar.xz - sha256: bad00d7ddac6652795a2ed52ce02a544ff4e891499b29ac71d28d20b8e1d26f3 - - - name: wine-gecko - buildsystem: simple - build-commands: - - install -D --target-directory=/usr/share/wine/gecko/ wine_gecko-*.msi - no-make-install: true - sources: - - type: file - only-arches: - - x86_64 - url: https://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86_64.msi - sha256: c565ea25e50ea953937d4ab01299e4306da4a556946327d253ea9b28357e4a7d - - type: file - url: https://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86.msi - sha256: 3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a - - - name: wine-mono - buildsystem: simple - build-commands: - - install -D --target-directory=/usr/share/wine/mono/ wine-mono-*.msi - no-make-install: true - sources: - - type: file - url: https://dl.winehq.org/wine/wine-mono/4.7.1/wine-mono-4.7.1.msi - sha256: 2c8d5db7f833c3413b2519991f5af1f433d59a927564ec6f38a3f1f8b2c629aa - - - name: cabextract - buildsystem: autotools - sources: - - type: archive - url: https://www.cabextract.org.uk/cabextract-1.6.tar.gz - sha256: cee661b56555350d26943c5e127fc75dd290b7f75689d5ebc1f04957c4af55fb - - - name: winetricks - buildsystem: simple - build-commands: - - make - - make install - sources: - - type: archive - url: https://github.com/Winetricks/winetricks/archive/20180513.tar.gz - sha256: 626aff64e3d93698704b0b668225d5504fd8ef556e3834f569058deaeafada8e - - name: metainfo buildsystem: simple build-commands: diff --git a/wine/3.20-staging/org.winepak.Platform.Wine.metainfo.xml b/wine/3.20-staging/org.winepak.Platform.Wine.metainfo.xml new file mode 100644 index 0000000..8114327 --- /dev/null +++ b/wine/3.20-staging/org.winepak.Platform.Wine.metainfo.xml @@ -0,0 +1,8 @@ + + + org.winepak.Platform.Wine + org.winepak.Platform.desktop + CC0-1.0 + Wine Staging + Add Wine Staging to the winepak Platform + diff --git a/wine/3.20-staging/org.winepak.Platform.Wine.yml b/wine/3.20-staging/org.winepak.Platform.Wine.yml new file mode 100644 index 0000000..b2f3589 --- /dev/null +++ b/wine/3.20-staging/org.winepak.Platform.Wine.yml @@ -0,0 +1,105 @@ +build-extension: true + +id: org.winepak.Platform.Wine +branch: 3.20-staging + +runtime: org.winepak.Platform +runtime-version: 3.0 +sdk: org.winepak.Sdk + +separate-locales: false +appstream-compose: false + +cleanup: + - /man + - /share/man + +build-options: + cflags: -O2 -g -fstack-protector-strong -D_FORTIFY_SOURCE=2 + cxxflags: -O2 -g -fstack-protector-strong -D_FORTIFY_SOURCE=2 + ldflags: -fstack-protector-strong -Wl,-z,relro,-z,now + prefix: "${FLATPAK_DEST}" + env: + V: '1' + +modules: + - name: wine-staging-win64 + only-arches: + - x86_64 + config-opts: + - --enable-win64 + - --disable-win16 + - --disable-tests + - --with-x + - --with-ldap + - --with-netapi + - --without-cups + - --without-curses + - --without-capi + - --without-glu + - --without-gphoto + - --without-gsm + - --without-hal + - --without-opencl + - --without-pcap + - --without-udev + - --without-v4l + cleanup: + - /share/man + - /share/applications + sources: + - type: archive + url: https://dl.winehq.org/wine/source/3.x/wine-3.20.tar.xz + sha256: 33d61122085056e091042df7d2cbe908ffb9c06e602278611dca2eea6a566f18 + - type: archive + url: https://github.com/wine-staging/wine-staging/archive/v3.20.tar.gz + sha256: 796e6dec0091aa8c22fb1adf3f4bd2b6122b5aac9ae90daffd2e4a4326d0115b + - type: shell + commands: + - ./patches/patchinstall.sh DESTDIR=$(pwd) --all + + - name: wine-staging-win32 + only-arches: + - i386 + config-opts: + - --disable-win64 + - --disable-win16 + - --disable-tests + - --with-x + - --with-ldap + - --with-netapi + - --without-cups + - --without-curses + - --without-capi + - --without-glu + - --without-gphoto + - --without-gsm + - --without-hal + - --without-opencl + - --without-pcap + - --without-udev + cleanup: + - /bin/function_grep.pl + - /include + - /share/man + - /share/applications + sources: + - type: archive + url: https://dl.winehq.org/wine/source/3.x/wine-3.20.tar.xz + sha256: 33d61122085056e091042df7d2cbe908ffb9c06e602278611dca2eea6a566f18 + - type: archive + url: https://github.com/wine-staging/wine-staging/archive/v3.20.tar.gz + sha256: 796e6dec0091aa8c22fb1adf3f4bd2b6122b5aac9ae90daffd2e4a4326d0115b + - type: shell + commands: + - ./patches/patchinstall.sh DESTDIR=$(pwd) --all + + - name: metainfo + buildsystem: simple + build-commands: + - install -Dm644 --target-directory=${FLATPAK_DEST}/share/metainfo org.winepak.Platform.Wine.metainfo.xml + - appstream-compose --basename=org.winepak.Platform.Wine --prefix=${FLATPAK_DEST} --origin=flatpak org.winepak.Platform.Wine + sources: + - type: file + path: org.winepak.Platform.Wine.metainfo.xml +