Skip to content
This repository has been archived by the owner. It is now read-only.

Package more Maemo packages and switch upstream to https://github.com/maemo-leste #1015

Merged
merged 9 commits into from Dec 19, 2017

Conversation

@NotKit
Copy link
Collaborator

@NotKit NotKit commented Dec 16, 2017

Package hildon-home and dependant packages.

Current Maemo development happens in https://github.com/maemo-leste. The repos from https://github.com/fremantle-gtk2/ were cloned there and fremantle-gtk2 organization likely won't be used anymore, so change all the Maemo packages to fetch from maemo-leste instead.

Most of the current changes in the repos are changes to Debian packaging, which have no affect on us, so I didn't edit revision to avoid extra rebuilds. Only hildon-desktop and iphbd are bumped to new revision due to code changes.

@NotKit NotKit force-pushed the NotKit:maemo branch from f0c5892 to 68dcf74 Dec 16, 2017
Copy link
Member

@ollieparanoid ollieparanoid left a comment

I've left a few comments. It's nice of you that you want to save rebuilding when the source did not change. But I think it should be done anyway, because when an error sneaks in now, then we would only discover it when upgrading the packages.

  • So if you don't mind, please increase the pkgrel for all changes packages.
  • Could you quickly describe what the new applications do?
  • In the meantime, we have set up packaging guidelines for packaging git commits here. I know that's some work, but could you go through the APKBUILDs you're changing anyway, and adjust them accordingly? (add the date to the pkgver, use _commit instead of _rev)
  • Since this is mostly older code based on autoconf, it might be that it does not compile out of the box for aarch64. If it's not too much effort for you, could you try to build all the new packages for aarch64 (pmbootstrap build --arch=aarch64 $pkgname) and apply the fix mentioned here where necessary?
  • Does maemo-leste upstream know, that we use their packages?

I know, these are lots of change requests. As always, I'm open to discussing everything.

Thanks a bunch for all the great contributions you're doing for postmarketOS @NotKit!

https://raw.githubusercontent.com/fremantle-gtk2/gtk/2.24.25-3m7%2Bmaemo/debian/patches/hildonize-gtk-textview.diff
https://raw.githubusercontent.com/fremantle-gtk2/gtk/2.24.25-3m7%2Bmaemo/debian/patches/hildonize-gtk-widget.diff
https://raw.githubusercontent.com/fremantle-gtk2/gtk/2.24.25-3m7%2Bmaemo/debian/patches/hildonize-gtk-window.diff
https://raw.githubusercontent.com/maemo-leste/gtk/master/debian/patches/hildonize-gdk-window.diff

This comment has been minimized.

@ollieparanoid

ollieparanoid Dec 16, 2017
Member

This seems to be a bit fragile, how about using a specific commit?

_commit="552c94ce4a423dfc5fe775dd71f55388be7b2d8d"
_patchurl="https://raw.githubusercontent.com/maemo-leste/gtk/$_commit/debian/patches/"
source=" ... $_patchurl/hildonize-gdk-window.diff ..."

build() {
cd "$builddir"
./autogen.sh --prefix=/usr CFLAGS="${CFLAGS} -Wno-error=deprecated-declarations -Wno-error=misleading-indentation"

This comment has been minimized.

@ollieparanoid

ollieparanoid Dec 16, 2017
Member

spaces used instead of tabs, also the line below

./autogen.sh
./configure --prefix=/usr --sysconfdir=/etc
# Compilation fails with multiple threads
make -j1

This comment has been minimized.

@ollieparanoid

ollieparanoid Dec 16, 2017
Member

Spaces used instead of tabs


build() {
cd "$builddir"
./autogen.sh --prefix=/usr

This comment has been minimized.

@ollieparanoid

ollieparanoid Dec 16, 2017
Member

Spaces instead of tabs


build() {
cd "$builddir"
./autogen.sh --prefix=/usr CFLAGS="${CFLAGS} -Wno-error=unused-but-set-variable"

This comment has been minimized.

build() {
cd "$builddir"
./autogen.sh
./configure --prefix=/usr

This comment has been minimized.

build() {
cd "$builddir"
autoreconf -i -f
./configure --prefix=/usr

This comment has been minimized.


build() {
cd "$builddir"
make

This comment has been minimized.

}

package() {
cd "$builddir"

This comment has been minimized.

@ollieparanoid

ollieparanoid Dec 16, 2017
Member

spaces, also in build()

NotKit added 3 commits Sep 23, 2017
Update hildon-desktop and iphbd to their newer repo versions. This includes the fix for the bug when switching between multiple windows in hildon-desktop.
@NotKit NotKit force-pushed the NotKit:maemo branch 2 times, most recently from d34cc4b to 4a0d3bc Dec 16, 2017
NotKit added 2 commits Dec 16, 2017
* Bump rels of packages that already exist in pmOS repos
* Indentation fixes
@NotKit NotKit force-pushed the NotKit:maemo branch from 4a0d3bc to 35bcdaf Dec 16, 2017
Oliver Smith
@ollieparanoid
Copy link
Member

@ollieparanoid ollieparanoid commented Dec 17, 2017

I've tried building with --strict mode to get all dependencies right, and noted that some still were missing. I've fixed some of them, but for me compiling stops at libhildonfm with:

...
checking pkg-config is at least version 0.9.0... yes
checking for GTK... yes
checking for HILDON... yes
checking for GCONF... yes
checking for HILDON_THUMBNAIL... yes
checking for LIBOSSOMIME... yes
checking for DBUSGLIB... yes
checking for LIBOSSO... yes
checking for MCE... yes
checking for GIO... yes
./configure: line 13070: GTK_DOC_CHECK: command not found
checking for perl5... no
checking for perl... perl
checking that generated files are newer than configure... done
configure: creating ./config.status
config.status: creating Makefile
config.status: error: cannot find input file: `hildon-fm/Makefile.in'
>>> ERROR: libhildonfm: all failed

So that needs to be fixed before we can merge it.

@NotKit NotKit force-pushed the NotKit:maemo branch from 0ea36c3 to 678c083 Dec 17, 2017
Oliver Smith added 2 commits Dec 19, 2017
Oliver Smith
Oliver Smith
Copy link
Member

@ollieparanoid ollieparanoid left a comment

Building runs through in strict mode for me (tested for x86_64).

@ollieparanoid
Copy link
Member

@ollieparanoid ollieparanoid commented Dec 19, 2017

Thanks again @NotKit, let's ship it 🚢 .

@MerlijnWajer, @parazyd: FYI we're using the Maemo Leste repos now, see postmarketOS.org for information about this project and feel free to ask us anything. Thanks for breathing new life into Maemo development!

@ollieparanoid ollieparanoid merged commit 1bced90 into postmarketOS:master Dec 19, 2017
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage remained the same at 64.037%
Details
PureTryOut added a commit that referenced this pull request Feb 21, 2018
* Package more maemo apps/libs (including Maemo X Terminal osso-xterm)
* Put libhildondesktop examples into separate package
* Change upstream url in Maemo packages to https://github.com/maemo-leste
Update hildon-desktop and iphbd to their newer repo versions. This includes the fix for the bug when switching between multiple windows in hildon-desktop.
* Use version tags instead of specific commits for Maemo packages
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.