Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
Loading items

Target

Select target project
0 results Searching
Select Git revision
Loading items
Show changes

Commits on Source 15

8 files
+ 60
− 57
Compare changes
  • Side-by-side
  • Inline

Files

.gitlab-ci.yml

+18 −6
Original line number Diff line number Diff line
@@ -9,7 +9,10 @@ ubuntu_deb: 
    - /^release\-.+/

  script:

    - ./scripts/package ubuntu_deb

    - cat transfer.log

  artifacts:

    paths:

    - build_*/ocs-url*.deb

    expire_in: 2 days



fedora_rpm:

  stage: build
@@ -19,24 +22,33 @@ fedora_rpm: 
    - /^release\-.+/

  script:

    - ./scripts/package fedora_rpm

    - cat transfer.log

  artifacts:

    paths:

    - build_*/RPMS/x86_64/ocs-url*.rpm

    expire_in: 2 days



opensuse_rpm:

  stage: build

  image: opensuse:42.1

  image: opensuse:42.3

  only:

    - master

    - /^release\-.+/

  script:

    - ./scripts/package opensuse_rpm

    - cat transfer.log

  artifacts:

    paths:

    - build_*/RPMS/x86_64/ocs-url*.rpm

    expire_in: 2 days



archlinux_pkg:

  stage: build

  image: base/archlinux:latest

  image: archlinux/base:latest

  only:

    - master

    - /^release\-.+/

  script:

    - ./scripts/package archlinux_pkg

    - cat transfer.log
 
  artifacts:

    paths:

    - build_*/ocs-url*.pkg.tar.xz

    expire_in: 2 days

README.md

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


An install helper program for items served via OpenCollaborationServices (ocs://).



Copyright: 2016-2018, Opendesktop.org

Copyright: 2016-2019, Opendesktop.org



License: GPL-3+

app/configs/application.json

+1 −1
Original line number Diff line number Diff line
@@ -9,5 +9,5 @@ 
    "license": "GPL-3+",

    "author": "Opendesktop.org",

    "contact": "contact@opendesktop.org",

    "homepage": "https://gitlab.opencode.net/OCS/ocs-url"

    "homepage": "https://git.opendesktop.org/akiraohgaki/ocs-url"

}

pkg/archlinux/PKGBUILD

+2 −2
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ pkgver='3.1.0' 
pkgrel='1'

pkgdesc='An install helper program for items served via OpenCollaborationServices (ocs://).'

arch=('i686' 'x86_64')

url='https://gitlab.opencode.net/OCS/ocs-url'

url='https://git.opendesktop.org/akiraohgaki/ocs-url'

license=('GPL3')

depends=('qt5-base>=5.2.0' 'qt5-svg>=5.2.0' 'qt5-declarative>=5.2.0' 'qt5-quickcontrols>=5.2.0')

makedepends=('git')

#source=("https://gitlab.opencode.net/OCS/ocs-url/-/archive/release-${pkgver}/ocs-url-release-${pkgver}.tar.gz")

#source=("https://git.opendesktop.org/akiraohgaki/ocs-url/-/archive/release-${pkgver}/ocs-url-release-${pkgver}.tar.gz")

source=("${pkgname}.tar.gz")

md5sums=() #autofill using updpkgsums

pkg/fedora/ocs-url.spec

+2 −2
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ Version: 3.1.0 
Release: 1%{?dist}

License: GPLv3+

Group: Applications/Internet

URL: https://gitlab.opencode.net/OCS/ocs-url

URL: https://git.opendesktop.org/akiraohgaki/ocs-url



#Source0: https://gitlab.opencode.net/OCS/ocs-url/-/archive/release-%{version}/ocs-url-release-%{version}.tar.gz

#Source0: https://git.opendesktop.org/akiraohgaki/ocs-url/-/archive/release-%{version}/ocs-url-release-%{version}.tar.gz

Source0: %{name}.tar.gz



Requires: qt5-qtbase >= 5.2.0, qt5-qtbase-gui >= 5.2.0, qt5-qtsvg >= 5.2.0, qt5-qtdeclarative >= 5.2.0, qt5-qtquickcontrols >= 5.2.0

pkg/opensuse/ocs-url.spec

+2 −2
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ Version: 3.1.0 
Release: 1%{?dist}

License: GPLv3+

Group: Applications/Internet

URL: https://gitlab.opencode.net/OCS/ocs-url

URL: https://git.opendesktop.org/akiraohgaki/ocs-url



#Source0: https://gitlab.opencode.net/OCS/ocs-url/-/archive/release-%{version}/ocs-url-release-%{version}.tar.gz

#Source0: https://git.opendesktop.org/akiraohgaki/ocs-url/-/archive/release-%{version}/ocs-url-release-%{version}.tar.gz

Source0: %{name}.tar.gz



Requires: libQt5Svg5 >= 5.2.0, libqt5-qtquickcontrols >= 5.2.0

pkg/ubuntu/debian/copyright

+2 −2
Original line number Diff line number Diff line 
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/

Upstream-Name: ocs-url

Upstream-Contact: Opendesktop.org <contact@opendesktop.org>

Source: https://gitlab.opencode.net/OCS/ocs-url

Source: https://git.opendesktop.org/akiraohgaki/ocs-url



Files: *

Copyright: 2016-2018, Opendesktop.org

Copyright: 2016-2019, Opendesktop.org

License: GPL-3+

 On Debian systems, the full text of the GNU General Public License version 3

 can be found in the `/usr/share/common-licenses/GPL-3' file.

scripts/package

+32 −41
Original line number Diff line number Diff line
@@ -11,17 +11,16 @@ PROJDIR="$(cd "$(dirname "${0}")/../" && pwd)" 
BUILDDIR="${PROJDIR}/build_${PKGNAME}"



ubuntu_deb() { # docker-image: ubuntu:14.04

    install_build_deps_ubuntu_deb

    add_pkguser

    su -c "export HOME=/home/${PKGUSER} && "${PKGSCRIPT}" build_ubuntu_deb" ${PKGUSER}

}



install_build_deps_ubuntu_deb() {

    apt update -qq

    apt -y install curl git

    apt -y install build-essential qt5-default libqt5svg5-dev qtdeclarative5-dev

    apt -y install devscripts debhelper fakeroot



    useradd -m ${PKGUSER}

    chown -R ${PKGUSER} "${PROJDIR}"



    su -c "export HOME=/home/${PKGUSER} && "${PKGSCRIPT}" build_ubuntu_deb" ${PKGUSER}



    transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*.deb")"

}



build_ubuntu_deb() {
@@ -35,16 +34,15 @@ build_ubuntu_deb() { 
}



fedora_rpm() { # docker-image: fedora:20

    install_build_deps_fedora_rpm

    add_pkguser

    su -c "export HOME=/home/${PKGUSER} && "${PKGSCRIPT}" build_fedora_rpm" ${PKGUSER}

}



install_build_deps_fedora_rpm() {

    yum -y install curl git

    yum -y install make automake gcc gcc-c++ libtool qt5-qtbase-devel qt5-qtsvg-devel qt5-qtdeclarative-devel

    yum -y install rpm-build



    useradd -m ${PKGUSER}

    chown -R ${PKGUSER} "${PROJDIR}"



    su -c "export HOME=/home/${PKGUSER} && "${PKGSCRIPT}" build_fedora_rpm" ${PKGUSER}



    transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*.rpm")"

}



build_fedora_rpm() {
@@ -57,18 +55,17 @@ build_fedora_rpm() { 
    rpmbuild --define "_topdir ${BUILDDIR}" -bb "${BUILDDIR}/SPECS/${PKGNAME}.spec"

}



opensuse_rpm() { # docker-image: opensuse:42.1

opensuse_rpm() { # docker-image: opensuse:42.3

    install_build_deps_opensuse_rpm

    add_pkguser

    su -c "export HOME=/home/${PKGUSER} && "${PKGSCRIPT}" build_opensuse_rpm" ${PKGUSER}

}



install_build_deps_opensuse_rpm() {

    zypper --non-interactive refresh

    zypper --non-interactive install curl git

    zypper --non-interactive install make automake gcc gcc-c++ libtool libqt5-qtbase-devel libqt5-qtsvg-devel libqt5-qtdeclarative-devel

    zypper --non-interactive install rpm-build



    useradd -m ${PKGUSER}

    chown -R ${PKGUSER} "${PROJDIR}"



    su -c "export HOME=/home/${PKGUSER} && "${PKGSCRIPT}" build_opensuse_rpm" ${PKGUSER}



    transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*.rpm")"

}



build_opensuse_rpm() {
@@ -81,18 +78,17 @@ build_opensuse_rpm() { 
    rpmbuild --define "_topdir ${BUILDDIR}" -bb "${BUILDDIR}/SPECS/${PKGNAME}.spec"

}



archlinux_pkg() { # docker-image: base/archlinux:latest

archlinux_pkg() { # docker-image: archlinux/base:latest

    install_build_deps_archlinux_pkg

    add_pkguser

    su -c "export HOME=/home/${PKGUSER} && "${PKGSCRIPT}" build_archlinux_pkg" ${PKGUSER}

}



install_build_deps_archlinux_pkg() {

    pacman -Syu --noconfirm

    pacman -S --noconfirm curl git

    pacman -S --noconfirm base-devel qt5-base qt5-svg qt5-declarative qt5-quickcontrols

    pacman -S --noconfirm pacman-contrib



    useradd -m ${PKGUSER}

    chown -R ${PKGUSER} "${PROJDIR}"



    su -c "export HOME=/home/${PKGUSER} && "${PKGSCRIPT}" build_archlinux_pkg" ${PKGUSER}



    transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*.pkg.tar.xz")"

}



build_archlinux_pkg() {
@@ -105,19 +101,14 @@ build_archlinux_pkg() { 
    makepkg -s

}



export_srcarchive() {

    if [ "${1}" ]; then

        $(cd "${PROJDIR}" && git archive --prefix="${PKGNAME}/" --output="${1}" HEAD)

    fi

add_pkguser() {

    useradd -m ${PKGUSER}

    chown -R ${PKGUSER} "${PROJDIR}"

}



transfer_file() {

    if [ -f "${1}" ]; then

        filename="$(basename "${1}")"

        transferlog="${PROJDIR}/transfer.log"

        echo "Uploading ${filename}" >> "${transferlog}"

        curl -fsSL -T "${1}" "https://transfer.sh/${filename}" >> "${transferlog}"

        echo '' >> "${transferlog}"

export_srcarchive() {

    if [ "${1}" ]; then

        (cd "${PROJDIR}" && git archive --prefix="${PKGNAME}/" --output="${1}" HEAD)

    fi

}