Skip to content

Commit

Permalink
Disable static library build
Browse files Browse the repository at this point in the history
Fix several namcap warnings and all namcap errors
Fix circular referenced depends of credential-preferences-ubuntu
  • Loading branch information
CReimer committed May 26, 2013
1 parent 674ac53 commit 27099ee
Show file tree
Hide file tree
Showing 26 changed files with 46 additions and 31 deletions.
2 changes: 1 addition & 1 deletion TESTPKG-dbus-test-runner/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ build() {
patch -p1 -i "${srcdir}/0001_autotools.patch"
export CFLAGS="${CFLAGS} -Wno-error"
autoreconf -vfi
./configure --prefix=/usr
./configure --enable-static=no --libexecdir=/usr/lib --prefix=/usr
make
}

Expand Down
4 changes: 3 additions & 1 deletion TESTPKG-gmock-ubuntu/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ build() {
patch -p1 -i "${srcdir}/debian/patches/${i}"
done

./configure --prefix=/usr --enable-external-gtest
./configure --enable-static=no --prefix=/usr --enable-external-gtest
make
}

Expand All @@ -56,6 +56,8 @@ package() {
rm -v "${pkgdir}/usr/share/aclocal/gtest.m4"

for i in "${pkgdir}"/usr/bin/*.py; do mv ${i} ${i%.py}; done

install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}

# vim:set ts=2 sw=2 et:
2 changes: 2 additions & 0 deletions TESTPKG-gtest-ubuntu/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ package() {
cp -a src/ "${pkgdir}/usr/src/gtest/"
cp -a CMakeLists.txt "${pkgdir}/usr/src/gtest/"
cp -a cmake/ "${pkgdir}/usr/src/gtest/"

install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}

# vim:set ts=2 sw=2 et:
2 changes: 2 additions & 0 deletions compiz-ubuntu/compiz-ubuntu.install
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ SCHEMAS=(compiz-addhelper.schemas compiz-animation.schemas

post_install() {
glib-compile-schemas usr/share/glib-2.0/schemas/
gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
}

pre_remove() {
Expand All @@ -42,6 +43,7 @@ pre_remove() {
gconf-schemas --unregister compiz-kde.schemas
fi
fi
gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
}

pre_upgrade() {
Expand Down
2 changes: 1 addition & 1 deletion credentials-preferences-ubuntu/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ url="https://launchpad.net/gnome-control-center-signon"
license=('GPL' 'LGPL')
provides=('credentials-preferences')
conflicts=('credentials-preferences')
depends=('libaccounts-glib' 'libsignon-glib' 'gtk3' 'FEATURE-libgnome-control-center')
depends=('libaccounts-glib' 'libsignon-glib' 'gtk3')
makedepends=('gobject-introspection' 'vala' 'intltool' 'itstool')
options=('!libtool')
install=${pkgname}.install
Expand Down
2 changes: 1 addition & 1 deletion frame/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pkgdesc="Touch Frame Library"
arch=('i686' 'x86_64')
url="https://launchpad.net/frame"
license=('LGPL')
depends=('libxi')
depends=('gcc-libs' 'libxi')
makedepends=('asciidoc' 'xorg-server-devel')
groups=('unity')
options=('!libtool' '!emptydirs')
Expand Down
1 change: 1 addition & 0 deletions gnome-control-center-ubuntu/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ build() {
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--libexecdir=/usr/lib/$pkgname \
--disable-static \
--enable-systemd

Expand Down
3 changes: 1 addition & 2 deletions gnome-session-ubuntu/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pkgrel=100
pkgdesc="The GNOME Session Handler"
arch=('i686' 'x86_64')
license=('GPL' 'LGPL')
depends=('systemd' 'dconf' 'gconf' 'gsettings-desktop-schemas' 'gtk3' 'gnome-desktop' 'hicolor-icon-theme' 'json-glib' 'libgl' 'libsm' 'libxtst' 'polkit-gnome' 'upower')
depends=('systemd' 'dconf' 'gconf' 'gsettings-desktop-schemas' 'gtk3' 'gnome-desktop' 'hicolor-icon-theme' 'json-glib' 'libgl' 'libsm' 'libxtst' 'upower')
makedepends=('gnome-common' 'gtk-doc' 'intltool' 'mesa' 'xtrans' 'patchutils')
groups=('gnome')
provides=("gnome-session=${pkgver}")
Expand Down Expand Up @@ -108,7 +108,6 @@ package() {
# symlink session files so that KDM can find them
install -dm755 "${pkgdir}/usr/share/apps/kdm/sessions/"
ln -s /usr/share/xsessions/ubuntu.desktop "${pkgdir}/usr/share/apps/kdm/sessions/"
ln -s /usr/share/xsessions/ubuntu-2d.desktop "${pkgdir}/usr/share/apps/kdm/sessions/"
}

# vim:set ts=2 sw=2 et:
2 changes: 1 addition & 1 deletion gnome-settings-daemon-ubuntu/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pkgdesc="The GNOME Settings daemon with Ubuntu's patches"
arch=('i686' 'x86_64')
url="http://www.gnome.org"
license=('GPL')
depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas-ubuntu' 'hicolor-icon-theme' 'ibus' 'libcanberra-pulse' 'libnotify' 'libsystemd' 'libwacom' 'nss' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'librsvg' 'libappindicator3')
depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas-ubuntu' 'hicolor-icon-theme' 'ibus' 'libcanberra-pulse' 'libnotify' 'libsystemd' 'libwacom' 'nss' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'librsvg' 'libappindicator3' 'packagekit')
makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl' 'desktop-file-utils')
groups=('unity')
provides=("gnome-settings-daemon=${pkgver}")
Expand Down
4 changes: 2 additions & 2 deletions grail/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pkgdesc="Gesture Recognition And Instantiation Library"
arch=('i686' 'x86_64')
url="https://launchpad.net/grail"
license=('LGPL')
depends=('frame' 'libxfixes' 'libxi')
depends=('gcc-libs' 'frame' 'libxfixes' 'libxi')
makedepends=('inputproto')
checkdepends=('xorg-gtest')
options=('!libtool')
Expand All @@ -23,7 +23,7 @@ build() {
autoreconf -vfi

# Static library needed for tests
./configure --prefix=/usr --with-x11 # --disable-static
./configure --prefix=/usr --with-x11 --disable-static
export MAKEFLAGS="-j1"
make
}
Expand Down
2 changes: 1 addition & 1 deletion gsettings-desktop-schemas-ubuntu/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pkgdesc="Shared GSettings schemas for the desktop"
arch=('any')
url="http://live.gnome.org/"
license=('GPL')
depends=('glib2')
depends=('dconf' 'glib2')
makedepends=('intltool' 'gobject-introspection')
provides=("${pkgname%-*}=${pkgver}")
conflicts=("${pkgname%-*}")
Expand Down
2 changes: 1 addition & 1 deletion indicator-application/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ build() {
cd "${srcdir}/${pkgname}-${_actual_ver}${_extra_ver}"

autoreconf -vfi
./configure --prefix=/usr --libexecdir=/usr/share/${pkgname} --disable-static
./configure --prefix=/usr --libexecdir=/usr/lib/${pkgname} --disable-static
make
}

Expand Down
6 changes: 3 additions & 3 deletions indicator-appmenu/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

pkgname=indicator-appmenu
_actual_ver=13.01.0
_extra_ver=daily13.03.28
_extra_ver=daily13.05.23.1
_translations=20130418
pkgver=${_actual_ver}${_extra_ver}
pkgrel=103
pkgrel=100
pkgdesc="An indicator to host the menus from an application"
arch=('i686' 'x86_64')
url="https://launchpad.net/indicator-appmenu"
Expand All @@ -25,7 +25,7 @@ install="${pkgname}.install"
source=("https://launchpad.net/ubuntu/+archive/primary/+files/indicator-appmenu_${_actual_ver}${_extra_ver}.orig.tar.gz"
"https://dl.dropboxusercontent.com/u/486665/Translations/translations-${_translations}-indicator-appmenu.tar.gz"
'0001_autoconf.patch')
sha512sums=('a8eb9d93c8b7373ebcfdfa37b0588925a83c2a3475a99046bb3a9c365ce50d16acf525d6c02c1430a0320aa3bb5d8d3ff69ece9450ba42d98c7ebba16b3720c1'
sha512sums=('19de0b5be11d0e2da6ad3937bdf7f74f96db8dc75869fbed3b4565b2b33bcb78572325472ae75019a898030c722438e48820ad1c7db94ac0c31dea3d90ad2cdc'
'68f2bab05620de5bb7879a8a6ecf94636fe3302b8087eac57c8e48e02a904e1f8ee9e109682f365f1990d23e92176f6f139aa6ecdc10fec84f4884758ac37474'
'31b83e433824bd7acd7be93bfd60932114eff344fea77c8ea1125272d5881fd61c1609d4fbf24de0cc8838e76d8ac405e7a19162e3ce2021b6b5b6dbb61c31f8')

Expand Down
2 changes: 1 addition & 1 deletion indicator-appmenu/compare_versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ source "$(dirname ${0})/../version_checker.sh"

echo -e "PKGBUILD version: ${_actual_ver}${_extra_ver}"
echo -e "Upstream version: $(get_launchpad_version ${pkgname})"
echo -e "Ubuntu version: $(get_ubuntu_version ${pkgname} ${1:-raring})"
echo -e "Ubuntu version: $(get_ubuntu_version ${pkgname} ${1:-saucy})"
echo -e "Translations: ${_translations}"
2 changes: 1 addition & 1 deletion indicator-messages/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pkgdesc="A place on the user's desktop that collects messages that need a respon
arch=('i686' 'x86_64')
url="https://launchpad.net/indicator-messages"
license=('GPL')
depends=('libdbusmenu-gtk3' 'libindicator3' 'telepathy-glib')
depends=('hicolor-icon-theme' 'libindicator3')
makedepends=('gobject-introspection' 'gtk-doc' 'intltool')
groups=('unity')
options=('!libtool')
Expand Down
4 changes: 2 additions & 2 deletions libcolumbus/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ arch=('i686' 'x86_64')
url="https://launchpad.net/libcolumbus"
license=('LGPL')
groups=('unity')
depends=('boost' 'icu' 'python' 'sparsehash')
makedepends=('cmake')
depends=('icu')
makedepends=('boost' 'cmake' 'sparsehash')
source=("https://launchpad.net/ubuntu/+archive/primary/+files/libcolumbus_${_actual_ver}${_extra_ver}.orig.tar.gz")
sha512sums=('0b241e4739baf5b652e112264df4bd3b013413728d48f9be949457cd4d253b3ae63ea173d94dac165cc08ba3df33604eccaf3385a263d814f2aee35c9e1ce38f')

Expand Down
2 changes: 1 addition & 1 deletion libdbusmenu/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ package_libdbusmenu() {

package_libdbusmenu-gtk2() {
pkgdesc+=" (GTK+ 2 library)"
depends=('gtk2-ubuntu' "libdbusmenu=${pkgver}")
depends=("libdbusmenu=${pkgver}")

cd "${srcdir}/${pkgbase}-${pkgver}/build-gtk2"

Expand Down
2 changes: 1 addition & 1 deletion libindicate/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ package_libindicate() {

package_libindicate-gtk2() {
pkgdesc+=" (GTK+ 2 library)"
depends=("libindicate=${pkgver}" 'gtk2-ubuntu' 'python2-gobject2')
depends=("libindicate=${pkgver}" 'python2-gobject2')

cd "${srcdir}/${pkgbase}-${pkgver}/build-gtk2"

Expand Down
2 changes: 1 addition & 1 deletion libunity-webapps/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ arch=('i686' 'x86_64')
url="https://launchpad.net/libunity-webapps"
license=('LGPL')
groups=('unity')
depends=('geoclue' 'glib2' 'hicolor-icon-theme' 'indicator-messages' 'json-glib' 'libdbusmenu-gtk3' 'libnotify' 'libsoup' 'libunity' 'libwnck3' 'packagekit' 'polkit' 'sqlite' 'telepathy-glib')
depends=('geoclue' 'hicolor-icon-theme' 'indicator-messages' 'libnotify' 'libsoup' 'libunity' 'libwnck3' 'packagekit')
makedepends=('gobject-introspection' 'gtk-doc' 'intltool')
checkdepends=('dbus-test-runner' 'xorg-server-xvfb')
options=('!libtool')
Expand Down
1 change: 1 addition & 0 deletions libunity/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ license=('LGPL')
depends=('libgee06' 'dee' 'libdbusmenu' 'gtk3')
makedepends=('intltool' 'vala' 'python2' 'gobject-introspection' 'vala0.18')
checkdepends=('python2-gobject' 'xorg-server-xvfb' 'xorg-xauth')
install=$pkgname.install
groups=('unity')
options=('!libtool')
source=("https://launchpad.net/ubuntu/+archive/primary/+files/libunity_${_actual_ver}${_extra_ver}.orig.tar.gz"
Expand Down
12 changes: 12 additions & 0 deletions libunity/libunity.install
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
post_install() {
glib-compile-schemas /usr/share/glib-2.0/schemas
update-desktop-database -q
}

post_upgrade() {
post_install $1
}

post_remove() {
post_install $1
}
2 changes: 1 addition & 1 deletion nux/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pkgdesc="Graphical user interface toolkit for applications that mixes OpenGL har
arch=('i686' 'x86_64')
url="https://launchpad.net/nux"
license=('LGPL')
depends=('gdk-pixbuf2' 'glew' 'pango' 'mesa' 'libsigc++' 'libxcomposite' 'libxdamage' 'libxxf86vm' 'geis' 'ibus')
depends=('gdk-pixbuf2' 'glew' 'pango' 'pciutils' 'mesa' 'libsigc++' 'libxcomposite' 'libxdamage' 'libxxf86vm' 'geis' 'ibus')
makedepends=('boost' 'glproto' 'dri2proto' 'doxygen' 'graphviz')
checkdepends=('gmock-ubuntu')

Expand Down
5 changes: 1 addition & 4 deletions overlay-scrollbar/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ url="https://launchpad.net/ayatana-scrollbar"
license=('LGPL')
groups=('unity')
makedepends=('gtk2-ubuntu' 'gtk3-ubuntu')
options=('!libtool')
options=('!libtool' '!emptydirs')
extrafiles=('overlay-scrollbar.install')
source=("https://launchpad.net/ubuntu/+archive/primary/+files/overlay-scrollbar_${_actual_ver}${_extra_ver}.orig.tar.gz")
sha512sums=('cde01f038b29b464aef9543cf8891275832ed82c0b5ca27c22228d35f4d68089e97e148c46ba3a1bbf341dc370566f4201e3c5dee3bdf9cc074a287230773fdd')
Expand Down Expand Up @@ -44,9 +44,6 @@ check() {
}

package_overlay-scrollbar() {
# Override AUR version
pkgver=100

pkgdesc="Scrollbar overlayed widget"
depends=('liboverlay-scrollbar' 'liboverlay-scrollbar3')
install=overlay-scrollbar.install
Expand Down
3 changes: 1 addition & 2 deletions unity-asset-pool/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ pkgdesc="Design assets for Unity"
arch=('any')
url="https://launchpad.net/unity-asset-pool"
license=('GPL')
depends=('gnome-icon-theme')
makedepends=('icon-naming-utils')
makedepends=('icon-naming-utils' 'python')
groups=('unity')
source=("https://launchpad.net/ubuntu/+archive/primary/+files/unity-asset-pool_${_actual_ver}${_extra_ver}.orig.tar.gz"
'archlinux-icon-tango-22.png'
Expand Down
4 changes: 2 additions & 2 deletions unity-lens-video/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ _translations=20130418
pkgver=${_actual_ver}.${_extra_ver}
pkgrel=101
pkgdesc="Unity Video lens"
arch=('any')
arch=('i686' 'x86_64')
url="https://launchpad.net/unity-lens-videos"
license=('GPL')
depends=('dee' 'json-glib' 'libgee' 'libsoup-gnome' 'libunity' 'libzeitgeist' 'unity-lens-music')
Expand Down Expand Up @@ -40,7 +40,7 @@ build() {

autoreconf -vfi
intltoolize -f
./configure --prefix=/usr --enable-headless-tests
./configure --prefix=/usr --libexecdir=/usr/lib --enable-headless-tests
make
}

Expand Down
2 changes: 1 addition & 1 deletion vala0.18/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pkgdesc="Compiler for the GObject type system"
arch=('i686' 'x86_64')
url="http://live.gnome.org/Vala"
license=('LGPL')
depends=('glib2')
depends=('bash' 'glib2')
makedepends=('gobject-introspection' 'libxslt')
checkdepends=('libx11')
conflicts=("vala<=${pkgver}")
Expand Down

0 comments on commit 27099ee

Please sign in to comment.