Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sailfishos/usb-moded
base: 966ac06fc14dff5259dd22bac2eb0b966cb6e70d
Choose a base ref
...
head repository: sailfishos/usb-moded
compare: 4ef3452adf21385eee8f156474bc67709ae3f2af
Choose a head ref
  • 9 commits
  • 7 files changed
  • 2 contributors

Commits on Sep 23, 2020

  1. [usb-moded] Require dbus-1 >= 1.8. Contributes to JB#51115 

    Require libdbus >= 1.8 as required by dbus-gmain and use
DBUS prefix during pkgconfig in autotools.

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>
    @Thaodan
    Thaodan committed Sep 23, 2020
    Copy the full SHA
    3c365c6 View commit details
    Browse the repository at this point in the history

  2. [usb-moded] Check for glib using a prefix. Contributes to JB#51115 

    Check for glib using the prefix GLIB as required by dbus-gmain tests
to prepend the appropriate variable prefix in front cflags and libs.

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>
    @Thaodan
    Thaodan committed Sep 23, 2020
    Copy the full SHA
    feaae51 View commit details
    Browse the repository at this point in the history

  3. [usb-moded] Use AM_PROG_AR as required by dbus_gmain. JB#51115 

    Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>
    @Thaodan
    Thaodan committed Sep 23, 2020
    Copy the full SHA
    763c0af View commit details
    Browse the repository at this point in the history

  4. [usb-moded] Remove obsolete macro . JB#51115 

    Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>
    @Thaodan
    Thaodan committed Sep 23, 2020
    Copy the full SHA
    c5a05e1 View commit details
    Browse the repository at this point in the history

  5. [usb-moded] Pass libdbus cflags/libs directly. JB#51115 

    Instead of using those passed by dbus-glib.

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>
    @Thaodan
    Thaodan committed Sep 23, 2020
    Copy the full SHA
    34a9726 View commit details
    Browse the repository at this point in the history

  6. [usb-moded] Use dbus_gmain instead of dbus-glib. JB#51115 

    Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>
    @Thaodan
    Thaodan committed Sep 23, 2020
    Copy the full SHA
    384f992 View commit details
    Browse the repository at this point in the history

  7. [usb-moded] Raise version requirement for glib2. JB#51115 

    As required by dbus-gmain. Also check for specific glib2 version in
spec file.

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>
    @Thaodan
    Thaodan committed Sep 23, 2020
    Copy the full SHA
    ba7d704 View commit details
    Browse the repository at this point in the history

  8. Remove useless whitespace 

    Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>
    @Thaodan
    Thaodan committed Sep 23, 2020
    Copy the full SHA
    57ee527 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2020

  1. Merge branch 'omp-jb51115' into 'master' 

    Use dbus_gmain instead of dbus-glib. JB#51115

See merge request mer-core/usb-moded!69
    @spiiroin
    spiiroin committed Sep 24, 2020
    Copy the full SHA
    4ef3452 View commit details
    Browse the repository at this point in the history