diff options
| author | Karl Cheng <qantas94heavy@gmail.com> | 2019-03-18 11:19:15 +0000 |
|---|---|---|
| committer | Qantas94Heavy <qantas94heavy@gmail.com> | 2019-03-20 09:16:22 +0000 |
| commit | ddbfad806bd38f8e7687ced12d7b56bf26306ca5 (patch) | |
| tree | ff9c6ca0613fd1afc2237c645a6ffbb7227f2339 | |
| parent | GTK-3.22 dependency (diff) | |
| download | inkscape-ddbfad806bd38f8e7687ced12d7b56bf26306ca5.tar.gz inkscape-ddbfad806bd38f8e7687ced12d7b56bf26306ca5.zip | |
Remove leftover popt references in build files
Refs: https://bugs.launchpad.net/inkscape/+bug/195220
Refs: https://gitlab.com/inkscape/inkscape/commit/6675a6fa8a3c2c2cf4ef80cab7400e58e7ff5b1b
Refs: https://gitlab.com/inkscape/inkscape/commit/408cb49b5559a81ea803df64bf58457a5dd4bf16
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | buildtools/msys2installdeps.sh | 1 | ||||
| -rw-r--r-- | packaging/autopackage/default.apspec.in | 3 | ||||
| -rw-r--r-- | snap/snapcraft.yaml | 1 |
4 files changed, 2 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f9638c69a..1a5b2e2f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,7 +86,7 @@ inkscape:mac: # Tools - brew install cmake intltool libtool pkg-config ccache # Libraries - - brew install bdw-gc boost gdl gettext gsl gtkmm3 gtkspell3 imagemagick@6 jemalloc libcdr libvisio libyaml libwpg pango popt poppler potrace libsoup + - brew install bdw-gc boost gdl gettext gsl gtkmm3 gtkspell3 imagemagick@6 jemalloc libcdr libvisio libyaml libwpg pango poppler potrace libsoup # Testing tools # TODO # Cleanup diff --git a/buildtools/msys2installdeps.sh b/buildtools/msys2installdeps.sh index 476d946f1..cb49c54b3 100644 --- a/buildtools/msys2installdeps.sh +++ b/buildtools/msys2installdeps.sh @@ -44,7 +44,6 @@ $ARCH-ninja eval pacman -S $PACMAN_OPTIONS \ $ARCH-gc \ $ARCH-gsl \ -$ARCH-popt \ $ARCH-libxslt \ $ARCH-boost \ $ARCH-gtk3 \ diff --git a/packaging/autopackage/default.apspec.in b/packaging/autopackage/default.apspec.in index c3175c1a3..c6a618130 100644 --- a/packaging/autopackage/default.apspec.in +++ b/packaging/autopackage/default.apspec.in @@ -16,7 +16,7 @@ PackageDesktop: share/applications/org.inkscape.Inkscape.desktop if [ ! -x configure ]; then ./autogen.sh fi -export APBUILD_STATIC="popt gc gccpp gtkmm-2.4 gdkmm-2.4 atkmm-1.6 pangomm-1.4 glibmm-2.4 sigc-2.0 Xrender lcms Xfixes Xext" +export APBUILD_STATIC="gc gccpp gtkmm-2.4 gdkmm-2.4 atkmm-1.6 pangomm-1.4 glibmm-2.4 sigc-2.0 Xrender lcms Xfixes Xext" export APBUILD_PROJECTNAME=inkscape PATH=/usr/local/src/inkscape/extra/static/bin:$PATH @@ -38,7 +38,6 @@ require @gnu.org/libstdc++ 3 require @xmlsoft.org/libxml2 2.6 require @xmlsoft.org/libxslt 1.0 require @gtk.org/gtk 2.8 -# statically linked for now: require @rpm.org/popt 0.0 # statically linked: require @libsigc.sourceforge.net/libsigc 3 require @libpng.org/libpng 3 # statically linked: require @gtkmm.org/gtkmm2 3 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 8d0319ccc..61af7d50f 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -56,7 +56,6 @@ parts: - libpango1.0-dev - libpoppler-glib-dev - libpoppler-private-dev - - libpopt-dev - libpotrace-dev - librevenge-dev - libsigc++-2.0-dev |