Skip to content

Commit

Permalink
Add lxpanel dev to resume failing build (#321)
Browse files Browse the repository at this point in the history
* Add lxpanel dev to resume failing build

Add the devel of lxpanel to fix the issue of failing to build the package

* Fixing build: lxpanel library with shlibdeps, and sphinx
  • Loading branch information
wizofe authored and skarbat committed May 25, 2018
1 parent a5de2e1 commit befce5c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
4 changes: 3 additions & 1 deletion debian/control
Expand Up @@ -8,9 +8,11 @@ Build-Depends:
build-essential,
pkg-config,
libgtk2.0-dev,
lxpanel (>= 0.7.0),
lxpanel-dev,
lxpanel,
libfm-dev,
libkdesk-dev,
python-sphinx,
gettext

Package: kano-updater
Expand Down
5 changes: 5 additions & 0 deletions debian/rules
Expand Up @@ -10,3 +10,8 @@ override_dh_auto_build:
dh_auto_build

override_dh_auto_test:

# override rule below because lxpanel does not explain version info from liblxpanel,
# and shlibs.local does not seem to fit either
override_dh_shlibdeps:
dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
7 changes: 5 additions & 2 deletions lxpanel-plugin/Makefile
Expand Up @@ -5,11 +5,14 @@

CC=gcc
CFLAGS=`pkg-config --cflags lxpanel gtk+-2.0`
LIBS=`pkg-config --libs lxpanel gtk+-2.0` -lkdesk-hourglass
LIBS=`pkg-config --libs lxpanel gtk+-2.0` -lkdesk-hourglass -llxpanel
SRC=kano_updater.c parson/parson.c
BIN=kano_updater.so
INSTALL_PATH=/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/lxpanel/plugins/

# The liblxpanel.so is not reported by pkg-config, help shlibdeps locate it
LXPANEL_RPATH=-Wl,-rpath=/usr/lib/arm-linux-gnueabihf/lxpanel

.PHONY: init

build: $(BIN)
Expand All @@ -22,4 +25,4 @@ install: $(BIN)
install -p -m 0644 $(BIN) $(INSTALL_PATH)

$(BIN): $(SRC)
$(CC) -Wall $(CFLAGS) -shared -fPIC $(SRC) -o $(BIN) $(LIBS)
$(CC) -Wall $(CFLAGS) -shared -fPIC $(SRC) -o $(BIN) $(LIBS) $(LXPANEL_RPATH)

0 comments on commit befce5c

Please sign in to comment.