Skip to content
GitLab
  • Menu
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in / Register
  • libhandy libhandy
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 131
    • Issues 131
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 19
    • Merge requests 19
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar

Due to an influx of spam, we have had to impose restrictions on new accounts. Please see this wiki page for instructions on how to get full permissions. Sorry for the inconvenience.

  • Librem5
  • libhandylibhandy
  • Merge requests
  • !293

glade: Don't install glade files outside build prefix

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Adrien Plazas requested to merge adrien.plazas/libhandy:glade-module-dir into master Jul 23, 2019
  • Overview 7
  • Commits 1
  • Pipelines 5
  • Changes 2

When using pkg-config variables to get installation directory locations, we must be careful to redefine any pkgconfig variables necessary to ensure the installation does not occur outside the build prefix. We could do, e.g.:

module_dir = gladeui_dep.get_pkgconfig_variable( 'moduledir', define_variable: ['libdir', libdir)])

Except in the particular case of glade, this is not possible because the pkg-config file uses absolute paths (i.e. the moduledir variable is not relative to libdir, and not even relative to prefix!) so there's no way to override it. This means we can't use the pkg-config directories at all.

If bored, fixing glade might be fun to do. In the meantime, we'll need to install these manually. This fixes the files being installed under /usr instead of /app when building a Fedora flatpak.

Note: submitted on behalf of Michael Catanzaro, he didn't want to create yet another account or something. 🤷️

Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: glade-module-dir