From b3723586e17050e2229b3d84fc3ea8adce880ca9 Mon Sep 17 00:00:00 2001 From: Michael Spencer Date: Sat, 25 Apr 2015 08:53:31 -0500 Subject: [PATCH] Initial commit --- .gitignore | 31 ++ channel.json | 10 + os-release | 7 + packages/broadcom-wl/PKGBUILD | 58 +++ packages/broadcom-wl/gcc.patch | 11 + packages/broadcom-wl/install | 13 + packages/broadcom-wl/license.patch | 10 + packages/broadcom-wl/linux-recent.patch | 350 ++++++++++++++++++ packages/broadcom-wl/modprobe.d | 5 + packages/glib2/PKGBUILD | 58 +++ packages/glib2/glib2.csh | 1 + packages/glib2/glib2.sh | 1 + packages/greenisland-git/PKGBUILD | 45 +++ packages/gsettings-qt-bzr/PKGBUILD | 32 ++ packages/hawaii-qt5-wayland-git/PKGBUILD | 43 +++ packages/linux-user-chroot/PKGBUILD | 23 ++ packages/ostree-git/PKGBUILD | 44 +++ packages/papyros-files/PKGBUILD | 26 ++ packages/papyros-shell/PKGBUILD | 31 ++ packages/qml-desktop/PKGBUILD | 26 ++ packages/qml-extras/PKGBUILD | 26 ++ packages/qml-material/PKGBUILD | 27 ++ packages/qt5-base-git/PKGBUILD | 77 ++++ packages/qt5-base-git/compilation_error.patch | 59 +++ packages/qt5-declarative-git/PKGBUILD | 37 ++ packages/qt5-graphicaleffects-git/PKGBUILD | 37 ++ packages/qt5-pim-eds-bzr/PKGBUILD | 31 ++ packages/qt5-pim-git/PKGBUILD | 39 ++ packages/qt5-quickcontrols-git/PKGBUILD | 37 ++ packages/qt5-svg-git/PKGBUILD | 37 ++ packages/qt5-wayland-dev-git/PKGBUILD | 94 +++++ packages/qt5-xmlpatterns-git/PKGBUILD | 37 ++ packages/xdg-app-git/PKGBUILD | 38 ++ post-install | 1 + 34 files changed, 1402 insertions(+) create mode 100644 .gitignore create mode 100644 channel.json create mode 100644 os-release create mode 100644 packages/broadcom-wl/PKGBUILD create mode 100644 packages/broadcom-wl/gcc.patch create mode 100644 packages/broadcom-wl/install create mode 100644 packages/broadcom-wl/license.patch create mode 100644 packages/broadcom-wl/linux-recent.patch create mode 100644 packages/broadcom-wl/modprobe.d create mode 100644 packages/glib2/PKGBUILD create mode 100644 packages/glib2/glib2.csh create mode 100644 packages/glib2/glib2.sh create mode 100644 packages/greenisland-git/PKGBUILD create mode 100644 packages/gsettings-qt-bzr/PKGBUILD create mode 100644 packages/hawaii-qt5-wayland-git/PKGBUILD create mode 100644 packages/linux-user-chroot/PKGBUILD create mode 100644 packages/ostree-git/PKGBUILD create mode 100644 packages/papyros-files/PKGBUILD create mode 100644 packages/papyros-shell/PKGBUILD create mode 100644 packages/qml-desktop/PKGBUILD create mode 100644 packages/qml-extras/PKGBUILD create mode 100644 packages/qml-material/PKGBUILD create mode 100644 packages/qt5-base-git/PKGBUILD create mode 100644 packages/qt5-base-git/compilation_error.patch create mode 100644 packages/qt5-declarative-git/PKGBUILD create mode 100644 packages/qt5-graphicaleffects-git/PKGBUILD create mode 100644 packages/qt5-pim-eds-bzr/PKGBUILD create mode 100644 packages/qt5-pim-git/PKGBUILD create mode 100644 packages/qt5-quickcontrols-git/PKGBUILD create mode 100644 packages/qt5-svg-git/PKGBUILD create mode 100644 packages/qt5-wayland-dev-git/PKGBUILD create mode 100644 packages/qt5-xmlpatterns-git/PKGBUILD create mode 100644 packages/xdg-app-git/PKGBUILD create mode 100644 post-install diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa21162 --- /dev/null +++ b/.gitignore @@ -0,0 +1,31 @@ +*~ +*.pkg.tar.xz +*.log* +.SRCINFO +build +info.json + +packages/*/pkg +packages/*/src +packages/qt5-base-git/qt5-base +packages/qt5-declarative-git/qt5-declarative +packages/qt5-xmlpatterns-git/qt5-xmlpatterns +packages/qt5-wayland-dev-git/qt5-wayland +packages/qt5-graphicaleffects-git/qt5-graphicaleffects +packages/qt5-pim-git/qt5-pim +packages/qt5-pim-eds-bzr/qtorganizer5-eds +packages/broadcom-wl/*.tar.gz +packages/papyros-shell/papyros-shell +packages/papyros-files/papyros-files +packages/qml-desktop/qml-desktop +packages/qml-material/qml-material +packages/qml-extras/qml-extras +packages/ostree-git/ostree-git +packages/linux-user-chroot/*.tar.gz +packages/xdg-app-git/xdg-app +packages/glib2/glib2 +packages/gsettings-qt-bzr/gsettings-qt +packages/qt5-quickcontrols-git/qt5-quickcontrols +packages/qt5-svg-git/qt5-svg +packages/greenisland-git/greenisland +packages/hawaii-qt5-wayland-git/qtwayland diff --git a/channel.json b/channel.json new file mode 100644 index 0000000..612ce74 --- /dev/null +++ b/channel.json @@ -0,0 +1,10 @@ +{ + "name": "papyros", + "packages": [ + "ostree-git", "xdg-app-git", + "qml-extras", "qml-material", "papyros-shell", "gdm", + "qt5-base-git", "qt5-declarative-git", "qt5-wayland-dev-git", + "xf86-video-vesa", "xorg-server", "xorg-server", "wayland", "sudo" + ], + "origin_url": "http://dash.papyros.io/ostree/papyros", +} \ No newline at end of file diff --git a/os-release b/os-release new file mode 100644 index 0000000..cf03db6 --- /dev/null +++ b/os-release @@ -0,0 +1,7 @@ +NAME="Papyros" +ID=papyrps +PRETTY_NAME="Papyros" +ANSI_COLOR="0;36" +HOME_URL="http://papyros.io/" +SUPPORT_URL="https://github.com/papyros/papyros/" +BUG_REPORT_URL="https://github.com/papyros/papyros/issues" diff --git a/packages/broadcom-wl/PKGBUILD b/packages/broadcom-wl/PKGBUILD new file mode 100644 index 0000000..1bf740b --- /dev/null +++ b/packages/broadcom-wl/PKGBUILD @@ -0,0 +1,58 @@ +# Maintainer: Armin K. +# Contributor: Austin ( doorknob60 [at] gmail [dot] com ) +# Contributor: Gaetan Bisson + +pkgname=broadcom-wl +pkgver=6.30.223.248 +pkgrel=5 +pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver' +url='http://www.broadcom.com/support/802.11/linux_sta.php' +arch=('i686' 'x86_64') +license=('custom') +depends=('linux') +makedepends=('linux-headers') +[[ $CARCH = x86_64 ]] && _arch=_64 || _arch= +source=("http://www.broadcom.com/docs/linux_sta/hybrid-v35${_arch}-nodebug-pcoem-${pkgver//./_}.tar.gz" + 'modprobe.d' + 'license.patch' + 'linux-recent.patch' + 'gcc.patch') +sha256sums=('b196543a429c22b2b8d75d0c1d9e6e7ff212c3d3e1f42cc6fd9e4858f01da1ad' + 'b4aca51ac5ed20cb79057437be7baf3650563b7a9d5efc515f0b9b34fbb9dc32' + '2f70be509aac743bec2cc3a19377be311a60a1c0e4a70ddd63ea89fae5df08ac' + 'aa01ee80cd9e7a212500a5f970064132f7df1a7db43269db0306019d4d7be6ca' + 'b07ce80f2e079cce08c8ec006dda091f6f73f158c8a62df5bac2fbabb6989849') +[[ $CARCH = x86_64 ]] && sha256sums[0]='3d994cc6c05198f4b6f07a213ac1e9e45a45159899e6c4a7feca5e6c395c3022' + +install=install + +_kernmajor="$(pacman -Q linux | awk '{print $2}' | cut -d - -f1 | cut -d . -f1,2)" +_extramodules="extramodules-${_kernmajor}-ARCH" +_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + +prepare() { + cd "${srcdir}" + + patch -p1 -i linux-recent.patch + patch -p1 -i license.patch + patch -p1 -i gcc.patch + + sed -e "/BRCM_WLAN_IFNAME/s:eth:wlan:" \ + -i src/wl/sys/wl_linux.c +} + +build() { + cd "${srcdir}" + + make -C /usr/lib/modules/${_kernver}/build M=`pwd` +} + +package() { + cd "${srcdir}" + + install -Dm644 wl.ko "${pkgdir}/usr/lib/modules/${_extramodules}/wl.ko" + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/wl.ko" + + install -Dm644 lib/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 modprobe.d "${pkgdir}/usr/lib/modprobe.d/broadcom-wl.conf" +} diff --git a/packages/broadcom-wl/gcc.patch b/packages/broadcom-wl/gcc.patch new file mode 100644 index 0000000..f93e3f1 --- /dev/null +++ b/packages/broadcom-wl/gcc.patch @@ -0,0 +1,11 @@ +--- a/Makefile 2014-06-26 10:42:08.000000000 +0000 ++++ b/Makefile 2014-07-17 22:44:01.662297228 +0000 +@@ -126,6 +126,8 @@ + EXTRA_CFLAGS += -I$(src)/src/shared/bcmwifi/include + #EXTRA_CFLAGS += -DBCMDBG_ASSERT -DBCMDBG_ERR + ++EXTRA_CFLAGS += -Wno-date-time ++ + EXTRA_LDFLAGS := $(src)/lib/wlc_hybrid.o_shipped + + KBASE ?= /lib/modules/`uname -r` diff --git a/packages/broadcom-wl/install b/packages/broadcom-wl/install new file mode 100644 index 0000000..8daceac --- /dev/null +++ b/packages/broadcom-wl/install @@ -0,0 +1,13 @@ +post_upgrade() { + for i in /usr/lib/modules/extramodules-* + do + if [ -f "$i/version" ] + then + depmod $(cat "$i/version") + fi + done +} + +post_install() { + post_upgrade +} diff --git a/packages/broadcom-wl/license.patch b/packages/broadcom-wl/license.patch new file mode 100644 index 0000000..1719a99 --- /dev/null +++ b/packages/broadcom-wl/license.patch @@ -0,0 +1,10 @@ +--- a/src/wl/sys/wl_linux.c 2014-06-26 10:42:08.000000000 +0000 ++++ b/src/wl/sys/wl_linux.c 2014-07-17 22:44:26.254759666 +0000 +@@ -205,6 +205,7 @@ + + static int nompc = 0; + module_param(nompc, int, 0); ++MODULE_LICENSE("Mixed/Proprietary"); + + #ifdef quote_str + #undef quote_str diff --git a/packages/broadcom-wl/linux-recent.patch b/packages/broadcom-wl/linux-recent.patch new file mode 100644 index 0000000..7fe6319 --- /dev/null +++ b/packages/broadcom-wl/linux-recent.patch @@ -0,0 +1,350 @@ +--- a/src/wl/sys/wl_cfg80211_hybrid.c 2014-06-26 12:42:08.000000000 +0200 ++++ b/src/wl/sys/wl_cfg80211_hybrid.c 2015-01-22 01:43:25.378920452 +0100 +@@ -63,8 +63,13 @@ + static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev, + struct cfg80211_ibss_params *params); + static s32 wl_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) + static s32 wl_cfg80211_get_station(struct wiphy *wiphy, + struct net_device *dev, u8 *mac, struct station_info *sinfo); ++#else ++static s32 wl_cfg80211_get_station(struct wiphy *wiphy, ++ struct net_device *dev, const u8 *mac, struct station_info *sinfo); ++#endif + static s32 wl_cfg80211_set_power_mgmt(struct wiphy *wiphy, + struct net_device *dev, bool enabled, s32 timeout); + static int wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, +@@ -1387,7 +1392,7 @@ + key_endian_to_host(&key); + + params.key_len = (u8) min_t(u8, DOT11_MAX_KEY_SIZE, key.len); +- memcpy(params.key, key.data, params.key_len); ++ memcpy((char *)params.key, key.data, params.key_len); + + if ((err = wl_dev_ioctl(dev, WLC_GET_WSEC, &wsec, sizeof(wsec)))) { + return err; +@@ -1421,9 +1426,15 @@ + return err; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) + static s32 + wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, + u8 *mac, struct station_info *sinfo) ++#else ++static s32 ++wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, ++ const u8 *mac, struct station_info *sinfo) ++#endif + { + struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy); + scb_val_t scb_val; +@@ -2010,9 +2021,15 @@ + + notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset); + notify_ielen = le32_to_cpu(bi->ie_length); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) + cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet), + 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, + (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); ++#else ++ cbss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN, (const u8 *)(bi->BSSID.octet), ++ 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, ++ (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); ++#endif + + if (unlikely(!cbss)) + return -ENOMEM; +@@ -2071,7 +2088,26 @@ + wl_get_assoc_ies(wl); + memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN); + wl_update_bss_info(wl); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) ++ { ++ struct wl_bss_info *bi; ++ u16 bss_info_channel; ++ struct ieee80211_channel *channel; ++ u32 freq; ++ ++ bi = (struct wl_bss_info *)(wl->extra_buf + 4); ++ bss_info_channel = bi->ctl_ch ? bi->ctl_ch : CHSPEC_CHANNEL(bi->chanspec); ++ ++ freq = ieee80211_channel_to_frequency(bss_info_channel, ++ (bss_info_channel <= CH_MAX_2G_CHANNEL) ? ++ IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ); ++ ++ channel = ieee80211_get_channel(wl_to_wiphy(wl), freq); ++ cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL); ++ } ++#else + cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL); ++#endif + set_bit(WL_STATUS_CONNECTED, &wl->status); + wl->profile->active = true; + } +@@ -2629,7 +2665,15 @@ + + void wl_cfg80211_detach(struct net_device *ndev) + { +- struct wl_cfg80211_priv *wl = ndev_to_wl(ndev); ++ struct wl_cfg80211_priv *wl; ++ struct wireless_dev *wdev; ++ ++ wdev = ndev->ieee80211_ptr; ++ if (wdev == NULL) { ++ printk(KERN_ERR "[%s()] in ndev=%p: IEEE80211ptr=%p\n", __FUNCTION__, ndev, wdev); ++ return; ++ } ++ wl = ndev_to_wl(ndev); + + wl_deinit_cfg80211_priv(wl); + wl_free_wdev(wl); +--- a/src/wl/sys/wl_dbg.h 2014-06-26 12:42:08.000000000 +0200 ++++ b/src/wl/sys/wl_dbg.h 2015-01-22 01:43:25.379920462 +0100 +@@ -55,10 +55,12 @@ + + #define WL_NONE(args) + ++#define FORCE_TRACE_LEVEL(fmt, ...) do { printk(KERN_ERR fmt, ## __VA_ARGS__); } while (0) /* ## is GCC specific syntax to remove comma when single arg */ ++ + #ifdef BCMDBG_ERR + #define WL_ERROR(args) WL_PRINT(args) + #else +-#define WL_ERROR(args) ++#define WL_ERROR(args) FORCE_TRACE_LEVEL args + #endif + #define WL_TRACE(args) + #define WL_APSTA_UPDN(args) +--- a/src/wl/sys/wl_linux.c 2014-06-26 12:42:08.000000000 +0200 ++++ b/src/wl/sys/wl_linux.c 2015-01-22 01:44:58.580453805 +0100 +@@ -878,7 +878,7 @@ + static SIMPLE_DEV_PM_OPS(wl_pm_ops, wl_suspend, wl_resume); + #endif + +-static struct pci_driver wl_pci_driver = { ++static struct pci_driver wl_pci_driver __refdata = { + .name = "wl", + .probe = wl_pci_probe, + .remove = __devexit_p(wl_remove), +@@ -1270,6 +1270,7 @@ + MFREE(wl->osh, wlif->dev, sizeof(struct net_device)); + #else + free_netdev(wlif->dev); ++ wlif->dev = NULL; + #endif + } + +@@ -1307,7 +1308,12 @@ + dev->priv = priv_link; + #else + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)) + dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup); ++#else ++ dev = alloc_netdev(sizeof(priv_link_t), intf_name, NET_NAME_UNKNOWN, ++ ether_setup); ++#endif + if (!dev) { + WL_ERROR(("wl%d: %s: alloc_netdev failed\n", + (wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__)); +@@ -1651,11 +1657,7 @@ + } + + WL_LOCK(wl); +- if (!capable(CAP_NET_ADMIN)) { +- bcmerror = BCME_EPERM; +- } else { +- bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif); +- } ++ bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif); + WL_UNLOCK(wl); + + done1: +@@ -2157,8 +2159,8 @@ + wlif = WL_DEV_IF(dev); + wl = WL_INFO(dev); + ++ skb->prev = NULL; + if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) { +- skb->prev = NULL; + + TXQ_LOCK(wl); + +@@ -2455,8 +2457,10 @@ + p80211msg_t *phdr; + + len = sizeof(p80211msg_t) + oskb->len - D11_PHY_HDR_LEN; +- if ((skb = dev_alloc_skb(len)) == NULL) ++ if ((skb = dev_alloc_skb(len)) == NULL) { ++ WL_ERROR(("in %s:%d [%s()] dev_alloc_skb() failure!", __FILE__, __LINE__, __FUNCTION__)); + return; ++ } + + skb_put(skb, len); + phdr = (p80211msg_t*)skb->data; +@@ -2535,8 +2539,10 @@ + rtap_len = sizeof(wl_radiotap_ht_brcm_2_t); + + len = rtap_len + (oskb->len - D11_PHY_HDR_LEN); +- if ((skb = dev_alloc_skb(len)) == NULL) ++ if ((skb = dev_alloc_skb(len)) == NULL) { ++ WL_ERROR(("in %s:%d [%s()] dev_alloc_skb() failure!", __FILE__, __LINE__, __FUNCTION__)); + return; ++ } + + skb_put(skb, len); + +@@ -2664,8 +2670,10 @@ + len += amsdu_len; + } + +- if ((skb = dev_alloc_skb(len)) == NULL) ++ if ((skb = dev_alloc_skb(len)) == NULL) { ++ WL_ERROR(("in %s:%d [%s()] dev_alloc_skb() failure!", __FILE__, __LINE__, __FUNCTION__)); + return; ++ } + + skb_put(skb, len); + +@@ -2990,7 +2998,7 @@ + } + + void +-wl_set_monitor(wl_info_t *wl, int val) ++wl_set_monitor(wl_info_t *wl, int val) /* public => is called by wlc_hybrid.o_shipped */ + { + const char *devname; + wl_if_t *wlif; +@@ -3224,42 +3232,75 @@ + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) + static int + wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data) ++{ ++ wl_info_t * wl = (wl_info_t *)data; + #else + static ssize_t +-wl_proc_read(struct file *filp, char __user *buffer, size_t length, loff_t *data) +-#endif ++wl_proc_read(struct file *filp, char __user *buffer, size_t length, loff_t *offp) + { +- wl_info_t * wl = (wl_info_t *)data; +- int to_user; +- int len; ++ wl_info_t * wl = PDE_DATA(file_inode(filp)); ++#endif ++ int bcmerror, len; ++ int to_user = 0; ++ char tmp[8]; + + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) + if (offset > 0) { + *eof = 1; + return 0; + } ++#else ++ if (*offp > 0) { /* for example, stop: cat /proc/brcm_monitor0 */ ++ return 0; /* 0 <=> EOF */ ++ } + #endif + +- if (!length) { +- WL_ERROR(("%s: Not enough return buf space\n", __FUNCTION__)); +- return 0; +- } + WL_LOCK(wl); +- wlc_ioctl(wl->wlc, WLC_GET_MONITOR, &to_user, sizeof(int), NULL); +- len = sprintf(buffer, "%d\n", to_user); +- WL_UNLOCK(wl); +- return len; ++ bcmerror = wlc_ioctl(wl->wlc, WLC_GET_MONITOR, &to_user, sizeof(int), NULL); ++ WL_UNLOCK(wl); ++ ++ if (bcmerror != BCME_OK) { ++ WL_ERROR(("%s: GET_MONITOR failed with %d\n", __FUNCTION__, bcmerror)); ++ return -EIO; ++ } ++ ++ len = snprintf(tmp, ARRAY_SIZE(tmp), "%d\n", to_user); ++ tmp[ARRAY_SIZE(tmp) - 1] = '\0'; ++ if (len >= ARRAY_SIZE(tmp)) { ++ printk(KERN_ERR "%s:%d [%s()] output would be truncated (ret=%d)!", __FILE__, __LINE__, __FUNCTION__, len); ++ return -ERANGE; ++ } ++ else if (len < 0) { ++ printk(KERN_ERR "%s:%d [%s()] unable to convert value (ret=%d)!", __FILE__, __LINE__, __FUNCTION__, len); ++ return len; ++ } ++ if (length < len) { ++ printk(KERN_ERR "%s:%d [%s()] user buffer is too small (at least=%d ; user=%d)!", __FILE__, __LINE__, __FUNCTION__, len, (int)length); ++ return -EMSGSIZE; ++ } ++ if (copy_to_user(buffer, tmp, len) != 0) { ++ printk(KERN_ERR "%s:%d [%s()] unable to copy data!", __FILE__, __LINE__, __FUNCTION__); ++ return -EFAULT; ++ } ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) ++ *offp += len; ++#endif ++ ++ return len; + } + + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) + static int + wl_proc_write(struct file *filp, const char *buff, unsigned long length, void *data) ++{ ++ wl_info_t * wl = (wl_info_t *)data; + #else + static ssize_t +-wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *data) +-#endif ++wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *offp) + { +- wl_info_t * wl = (wl_info_t *)data; ++ wl_info_t * wl = PDE_DATA(file_inode(filp)); ++#endif + int from_user = 0; + int bcmerror; + +@@ -3270,7 +3311,11 @@ + } + if (copy_from_user(&from_user, buff, 1)) { + WL_ERROR(("%s: copy from user failed\n", __FUNCTION__)); +- return -EIO; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) ++ return -EIO; ++#else ++ return -EFAULT; ++#endif + } + + if (from_user >= 0x30) +@@ -3280,10 +3325,15 @@ + bcmerror = wlc_ioctl(wl->wlc, WLC_SET_MONITOR, &from_user, sizeof(int), NULL); + WL_UNLOCK(wl); + +- if (bcmerror < 0) { ++ if (bcmerror != BCME_OK) { + WL_ERROR(("%s: SET_MONITOR failed with %d\n", __FUNCTION__, bcmerror)); + return -EIO; + } ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)) && 0 /* no need to update offset because this file should only trigger action... */ ++ *offp += length; ++#endif ++ + return length; + } + +@@ -3304,8 +3354,8 @@ + if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) { + WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp)); + #else +- if ((wl->proc_entry = proc_create(tmp, 0644, NULL, &wl_fops)) == NULL) { +- WL_ERROR(("%s: proc_create %s failed\n", __FUNCTION__, tmp)); ++ if ((wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_fops, wl)) == NULL) { ++ WL_ERROR(("%s: proc_create_data %s failed\n", __FUNCTION__, tmp)); + #endif + ASSERT(0); + return -1; diff --git a/packages/broadcom-wl/modprobe.d b/packages/broadcom-wl/modprobe.d new file mode 100644 index 0000000..f09d4c1 --- /dev/null +++ b/packages/broadcom-wl/modprobe.d @@ -0,0 +1,5 @@ +blacklist b43 +blacklist ssb +blacklist bcma +blacklist brcmsmac +blacklist brcmfmac diff --git a/packages/glib2/PKGBUILD b/packages/glib2/PKGBUILD new file mode 100644 index 0000000..711cdb7 --- /dev/null +++ b/packages/glib2/PKGBUILD @@ -0,0 +1,58 @@ +# Maintainer: Limao Luo +# Contributor: Yichao Yu +# Contributor: kfgz + +pkgname=glib2 +pkgver=2.43.3.2.gef09373 +pkgrel=1 +pkgdesc="Common C routines used by GTK+ 2.4 and other libs" +arch=(i686 x86_64) +url=http://git.gnome.org/browse/glib/tree/README.in +license=(GPL2) +depends=(elfutils python2) +makedepends=(gtk-doc git) +provides=($pkgname=$pkgver) +conflicts=($pkgname) +options=(!emptydirs !libtool) +source=($pkgname::git://git.gnome.org/glib + $pkgname.sh + $pkgname.csh) +sha256sums=('SKIP' + '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' + '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3') +sha512sums=('SKIP' + 'dca2bc74d2013fcb24145ac794eef457aa3213c039e40a1a26ca5017694930768e7c80e334e17a56834549dff6549c781ddd91fae6c7bbb26fdd6a083ad8217a' + 'c3899eb7fa5482ce8a35fe02db90fd0f928d50aa7e4365a9529ef35a2dcd1ed86d5a24f6bc5c635ef5b2d95a0ebfebc2bb6bc90404c99f6fb7484ed2fa032c06') + +pkgver() { + cd $pkgname/ + git describe | sed 's/-/./g' +} + +prepare() { + cd $pkgname/ + touch gtk-doc.make + sed -i '1i\EXTRA_DIST=""\nCLEANFILES=""\n' docs/reference/{gio{,/gdbus-object-manager-example},gobject,glib}/Makefile.am +} + +build() { + cd $pkgname/ + touch README + autoreconf -fi + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib \ + --sysconfdir=/etc \ + --with-pcre=system \ + --disable-fam + make +} + +package() { + make -C $pkgname DESTDIR="$pkgdir" install + for i in $pkgname.{,c}sh; do + install -Dm755 $i "$pkgdir"/etc/profile.d/$i + done + find "$pkgdir"/usr/share/bash-completion/completions/ -type f -exec chmod -x '{}' \; + sed -i 's:^#!/usr/bin/env python$:&2:g' "$pkgdir"/usr/bin/gdbus-codegen +} diff --git a/packages/glib2/glib2.csh b/packages/glib2/glib2.csh new file mode 100644 index 0000000..7aa3a2f --- /dev/null +++ b/packages/glib2/glib2.csh @@ -0,0 +1 @@ +setenv G_BROKEN_FILENAMES 1 diff --git a/packages/glib2/glib2.sh b/packages/glib2/glib2.sh new file mode 100644 index 0000000..96a056e --- /dev/null +++ b/packages/glib2/glib2.sh @@ -0,0 +1 @@ +export G_BROKEN_FILENAMES=1 diff --git a/packages/greenisland-git/PKGBUILD b/packages/greenisland-git/PKGBUILD new file mode 100644 index 0000000..1bff565 --- /dev/null +++ b/packages/greenisland-git/PKGBUILD @@ -0,0 +1,45 @@ +# Maintainer: Pier Luigi Fiorini + +pkgname=greenisland-git +pkgver=20150328.33339be +pkgrel=1 +pkgdesc="Green Island: Qt-based compositor infrastructure for Wayland" +arch=('i686' 'x86_64' 'armv6h' 'armv7h') +url='https://github.com/greenisland/greenisland.git' +license=('GPL', 'LGPL') +depends=('qt5-declarative' 'hawaii-qt5-wayland-git' 'libkscreen-frameworks' "kpackage") +makedepends=('git' 'gdb' 'extra-cmake-modules') +options=('debug') + +_gitroot="git://github.com/greenisland/greenisland.git" +_gitbranch=master +_gitname=greenisland +source=(${_gitname}::${_gitroot}#branch=${_gitbranch}) +md5sums=('SKIP') + +pkgver() { + cd ${srcdir}/${_gitname} + echo "$(git log -1 --format="%cd" --date=short | tr -d '-').$(git log -1 --format="%h")" +} + +prepare() { + mkdir build +} + +build() { + cd build + cmake ../${_gitname} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_INSTALL_DIR=lib \ + -DLIBEXEC_INSTALL_DIR=lib \ + -DQML_INSTALL_DIR=lib/qt/qml \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DQtWaylandScanner_EXECUTABLE=/usr/lib/qt/bin/qtwaylandscanner \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} diff --git a/packages/gsettings-qt-bzr/PKGBUILD b/packages/gsettings-qt-bzr/PKGBUILD new file mode 100644 index 0000000..1b45b99 --- /dev/null +++ b/packages/gsettings-qt-bzr/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Charles Bos + +pkgname=gsettings-qt-bzr +_bzrname=gsettings-qt +pkgver=0.1.r68 +pkgrel=1 +pkgdesc="Qml bindings for GSettings." +arch=('i686' 'x86_64') +url="https://launchpad.net/gsettings-qt" +makedepends=('bzr') +depends=('qt5-base' 'qt5-declarative') +provides=('gsettings-qt') +license=('GPL') +source=("$_bzrname::bzr+http://bazaar.launchpad.net/~system-settings-touch/$_bzrname/trunk/") +md5sums=('SKIP') + +pkgver() { + cd $_bzrname + printf "0.1.r%s" "$(bzr revno)" +} + +build() { + cd "$srcdir"/$_bzrname + qmake gsettings-qt.pro + make +} + +package() { + cd "$srcdir"/$_bzrname + make INSTALL_ROOT="$pkgdir" install +} + diff --git a/packages/hawaii-qt5-wayland-git/PKGBUILD b/packages/hawaii-qt5-wayland-git/PKGBUILD new file mode 100644 index 0000000..0b1b0d1 --- /dev/null +++ b/packages/hawaii-qt5-wayland-git/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer: Pier Luigi Fiorini + +pkgname=hawaii-qt5-wayland-git +pkgver=v5.4.0.beta1.76.g4cc154a +pkgrel=1 +pkgdesc="A cross-platform application and UI framework (QtWayland)" +arch=('i686' 'x86_64' 'armv6h') +url="http://qt-project.org/" +license=('GPL3' 'LGPL') +depends=('qt5-base' 'qt5-declarative' 'libxcomposite' 'libxrender' 'mtdev' 'wayland') +provides=('qt5-wayland') +conflicts=('qt5-wayland') +replaces=('qt5-wayland') +makedepends=('git' 'gdb') +options=('!libtool' 'debug') +#source=(git://gitorious.org/qt/qtwayland.git#branch=dev) +source=(git://github.com/maui-packages/qtwayland#branch=output55) +md5sums=('SKIP') +_ver=5.6.0 + +pkgver() { + cd qtwayland + git describe --always | sed 's|-|.|g' +} + +prepare() { + cd qtwayland +} + +build() { + cd qtwayland + qmake CONFIG+=wayland-compositor + make +} + +package() { + cd qtwayland + make INSTALL_ROOT="${pkgdir}" install + + # Workaround to install generated private headers + cp ./include/QtCompositor/${_ver}/QtCompositor/private/{qwayland-server-*,*protocol*}.h \ + ${pkgdir}/usr/include/qt/QtCompositor/${_ver}/QtCompositor/private/ +} diff --git a/packages/linux-user-chroot/PKGBUILD b/packages/linux-user-chroot/PKGBUILD new file mode 100644 index 0000000..cdec54b --- /dev/null +++ b/packages/linux-user-chroot/PKGBUILD @@ -0,0 +1,23 @@ +pkgname='linux-user-chroot' +pkgver='2013.1' +pkgrel='2' +pkgdesc='setuid helper for making bind mounts and chrooting' +url='http://git.gnome.org/browse/linux-user-chroot/tree/README' +arch=('i686' 'x86_64') +license='GPL' +depends=('glibc') +makedepends=('git') +source=("https://git.gnome.org/browse/${pkgname}/snapshot/${pkgname}-${pkgver}.tar.gz") +sha1sums=('4d158e691732ad6e6be95203146c448bd64e90a0') + +build () { + cd "${srcdir}/${pkgname}-${pkgver}" + ./autogen.sh --prefix=/usr --enable-newnet-helper + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make install DESTDIR="${pkgdir}" + chmod +s "${pkgdir}/usr/bin"/linux-user-chroot{,-newnet} +} diff --git a/packages/ostree-git/PKGBUILD b/packages/ostree-git/PKGBUILD new file mode 100644 index 0000000..673ceb1 --- /dev/null +++ b/packages/ostree-git/PKGBUILD @@ -0,0 +1,44 @@ +pkgname='ostree-git' +pkgver=2015.4 +pkgrel=1 +url="http://git.gnome.org/browse/ostree/tree/README.md" +pkgdesc='OSTree is a tool for managing bootable, versioned filesystem trees.' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +provides=('ostree') +conflicts=("ostree") +makedepends=('pkg-config' 'gtk-doc' 'git') +depends=('libarchive' + 'linux-user-chroot' + 'libsoup' + 'gpgme' + 'systemd' + 'libgsystem' + 'gobject-introspection') + +source=("${pkgname}::git+git://git.gnome.org/ostree#tag=v$pkgver") +md5sums=('SKIP') + +build() { + cd "${srcdir}/${pkgname}" + ./autogen.sh \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib/ \ + --sysconfdir=/etc \ + --with-soup \ + --with-gpgme \ + --with-systemd \ + --with-libarchive \ + --with-mkinitcpio \ + --without-dracut \ + --without-selinux \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --enable-gtk-doc + make +} + +package() { + cd "${srcdir}/${pkgname}" + make install DESTDIR="$pkgdir" +} diff --git a/packages/papyros-files/PKGBUILD b/packages/papyros-files/PKGBUILD new file mode 100644 index 0000000..812daee --- /dev/null +++ b/packages/papyros-files/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Michael Spencer + +pkgname=papyros-files +pkgver=0.0.5 +pkgrel=2 +pkgdesc="The file manager for Papyros" +arch=("i686" "x86_64") +url="https://github.com/papyros/files-app" +license=("LGPL") +depends=("qt5-declarative-git" "qt5-graphicaleffects-git" "kdeclarative" "qml-material" "taglib") +makedepends=("git" "cmake" "intltool") +provides=("$pkgname") +source=("$pkgname::git+https://github.com/papyros/files-app.git#tag=v$pkgver") +sha256sums=("SKIP") + +prepare() { + mkdir -p build + cd build + cmake "$srcdir/$pkgname" + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} diff --git a/packages/papyros-shell/PKGBUILD b/packages/papyros-shell/PKGBUILD new file mode 100644 index 0000000..714bed5 --- /dev/null +++ b/packages/papyros-shell/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Michael Spencer + +pkgname=papyros-shell +pkgver=0.0.5 +pkgrel=3 +pkgdesc="Wayland and QtQuick based desktop shell for Papyros" +arch=("i686" "x86_64") +url="https://github.com/papyros/papyros-shell" +license=("GPL") +depends=("qt5-base-git" "qt5-declarative-git" "qt5-quickcontrols-git" "qt5-graphicaleffects-git" + "qt5-wayland-dev-git" "gsettings-qt-bzr" "qml-material" "qml-extras" "qml-desktop") +makedepends=("git" "python") +provides=("$pkgname") +source=("$pkgname::git+https://github.com/papyros/papyros-shell.git#tag=v$pkgver") +sha256sums=("SKIP") + +prepare() { + pushd "$srcdir/$pkgname" + ./qrc.py qml images > papyros-shell.qrc + popd + + mkdir -p build + cd build + qmake "$srcdir/$pkgname" + make +} + +package() { + cd build + make INSTALL_ROOT="$pkgdir" install +} diff --git a/packages/qml-desktop/PKGBUILD b/packages/qml-desktop/PKGBUILD new file mode 100644 index 0000000..0fd913b --- /dev/null +++ b/packages/qml-desktop/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Michael Spencer + +pkgname=qml-desktop +pkgver=0.0.5 +pkgrel=1 +pkgdesc="A C++ plugin for QML to access desktop features" +arch=("i686" "x86_64") +url="https://github.com/papyros/qml-desktop" +license=("LGPL") +depends=("qt5-base-git" "qt5-declarative-git" "libpulse" "glib2") +makedepends=("git") +provides=("$pkgname") +source=("$pkgname::git+https://github.com/papyros/qml-desktop.git#tag=v$pkgver") +sha256sums=("SKIP") + +prepare() { + mkdir -p build + cd build + qmake "$srcdir/$pkgname" + make +} + +package() { + cd build + make INSTALL_ROOT="$pkgdir" install +} diff --git a/packages/qml-extras/PKGBUILD b/packages/qml-extras/PKGBUILD new file mode 100644 index 0000000..778f42b --- /dev/null +++ b/packages/qml-extras/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Michael Spencer + +pkgname=qml-extras +pkgver=0.0.5 +pkgrel=1 +pkgdesc="A UI framework for QtQuick implementing Material Design" +arch=("i686" "x86_64") +url="https://github.com/papyros/qml-extras" +license=("LGPL") +depends=("qt5-base-git" "qt5-declarative-git") +makedepends=("git") +provides=("$pkgname") +source=("$pkgname::git+https://github.com/papyros/qml-extras.git#tag=v$pkgver") +sha256sums=("SKIP") + +prepare() { + mkdir -p build + cd build + qmake "$srcdir/$pkgname" + make +} + +package() { + cd build + make INSTALL_ROOT="$pkgdir" install +} diff --git a/packages/qml-material/PKGBUILD b/packages/qml-material/PKGBUILD new file mode 100644 index 0000000..2e1a69c --- /dev/null +++ b/packages/qml-material/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Michael Spencer + +pkgname=qml-material +pkgver=0.0.5 +pkgrel=2 +pkgdesc="A UI framework for QtQuick implementing Material Design" +arch=("i686" "x86_64") +url="https://github.com/papyros/qml-material" +license=("LGPL") +depends=("qt5-base-git" "qt5-declarative-git" "qt5-quickcontrols-git" "qt5-svg-git" + "qt5-graphicaleffects-git" "qml-extras") +makedepends=("git") +provides=("$pkgname") +source=("$pkgname::git+https://github.com/papyros/qml-material.git#tag=v$pkgver") +sha256sums=("SKIP") + +prepare() { + mkdir -p build + cd build + qmake "$srcdir/$pkgname" + make +} + +package() { + cd build + make INSTALL_ROOT="$pkgdir" install +} diff --git a/packages/qt5-base-git/PKGBUILD b/packages/qt5-base-git/PKGBUILD new file mode 100644 index 0000000..779f620 --- /dev/null +++ b/packages/qt5-base-git/PKGBUILD @@ -0,0 +1,77 @@ +# Maintainer: Jerome Leclanche +# Contributor: Andrea Scarpino +# Contributor: Pier Luigi Fiorini + +_pkgname=qt5-base +pkgname=$_pkgname-git +pkgver=v5.4.1.1228.gefe3f63 +pkgrel=1 +pkgdesc="A cross-platform application and UI framework" +arch=("i686" "x86_64") +url="https://qt-project.org/" +license=("GPL3" "LGPL") +depends=( + "dbus" "xcb-util-keysyms" "xcb-util-wm" "xcb-util-image" + "libxext" "inputproto" "libgl" "libxkbcommon" "systemd" + "libpng" "sqlite" "fontconfig" "icu" "libxrender" +) +makedepends=("git" "postgresql-libs") +optdepends=( + "qtchooser: set the default Qt toolkit" + "postgresql-libs: PostgreSQL driver" + "libmariadbclient: MariaDB driver" + "unixodbc: ODBC driver" + "libfbclient: Firebird/iBase driver" +) +provides=("$_pkgname") +source=("$_pkgname::git://gitorious.org/qt/qtbase.git#branch=5.5" + "compilation_error.patch") +sha256sums=("SKIP" + "722282a18e0b72d401fc8429a5932a6023972d57314853c54ba4507d001cc85e") + +pkgver() { + cd "$srcdir/$_pkgname" + git describe --always | sed "s/-/./g" +} + +prepare() { + cd "$srcdir/$_pkgname" + sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf + sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" "mkspecs/common/gcc-base-unix.conf" + sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" "mkspecs/common/gcc-base.conf" + + git apply ../compilation_error.patch +} + +build() { + cd "$srcdir/$_pkgname" + + ./configure -confirm-license -opensource \ + -prefix /usr \ + -bindir /usr/lib/qt/bin \ + -docdir /usr/share/doc/qt \ + -headerdir /usr/include/qt \ + -archdatadir /usr/lib/qt \ + -datadir /usr/share/qt \ + -sysconfdir /etc/xdg \ + -examplesdir /usr/share/doc/qt/examples \ + -system-sqlite \ + -openssl-linked \ + -nomake examples \ + -nomake tests \ + -no-rpath \ + -optimized-qmake \ + -dbus-linked \ + -reduce-relocations \ + -opengl es2 + make +} + +package() { + cd "$srcdir/$_pkgname" + make INSTALL_ROOT="$pkgdir" install + for file in "${pkgdir}"/usr/lib/qt/bin/*; do + mkdir -p "${pkgdir}"/usr/bin + ln -s /usr/lib/qt/bin/$(basename $file) "${pkgdir}"/usr/bin/$(basename $file) + done +} diff --git a/packages/qt5-base-git/compilation_error.patch b/packages/qt5-base-git/compilation_error.patch new file mode 100644 index 0000000..d9a7ca2 --- /dev/null +++ b/packages/qt5-base-git/compilation_error.patch @@ -0,0 +1,59 @@ +From de9bd40d26cd905f453013cff3cc7691fe8a7389 Mon Sep 17 00:00:00 2001 +From: Nikita Baryshnikov +Date: Thu, 26 Feb 2015 09:04:20 +0300 +Subject: [PATCH] QSslSocket: fix compilation error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +invalid conversion from ‘unsigned char**’ to ‘const unsigned char**’ + +Change-Id: I6263db106fe28c6aa04db8ca79421b3a9fc5adc9 +--- + src/network/ssl/qsslcontext_openssl.cpp | 2 +- + src/network/ssl/qsslsocket_openssl_symbols.cpp | 2 +- + src/network/ssl/qsslsocket_openssl_symbols_p.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp +index a729593..b88ab54 100644 +--- a/src/network/ssl/qsslcontext_openssl.cpp ++++ b/src/network/ssl/qsslcontext_openssl.cpp +@@ -60,7 +60,7 @@ static DH *get_dh1024() + "/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7OZTgf//////////AgEC")); + + const char *ptr = params.constData(); +- DH *dh = q_d2i_DHparams(NULL, (unsigned char **)(&ptr), params.length()); ++ DH *dh = q_d2i_DHparams(NULL, reinterpret_cast(&ptr), params.length()); + + return dh; + } +diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp +index 7d29e25..e2700df 100644 +--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp ++++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp +@@ -399,7 +399,7 @@ DEFINEFUNC3(void, SSL_get0_next_proto_negotiated, const SSL *s, s, + #endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ... + DEFINEFUNC(DH *, DH_new, DUMMYARG, DUMMYARG, return 0, return) + DEFINEFUNC(void, DH_free, DH *dh, dh, return, DUMMYARG) +-DEFINEFUNC3(DH *, d2i_DHparams, DH**a, a, unsigned char **pp, pp, long length, length, return 0, return); ++DEFINEFUNC3(DH *, d2i_DHparams, DH**a, a, const unsigned char **pp, pp, long length, length, return 0, return) + DEFINEFUNC3(BIGNUM *, BN_bin2bn, const unsigned char *s, s, int len, len, BIGNUM *ret, ret, return 0, return) + #ifndef OPENSSL_NO_EC + DEFINEFUNC(EC_KEY *, EC_KEY_dup, const EC_KEY *ec, ec, return 0, return) +diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h +index aedd477..626c049 100644 +--- a/src/network/ssl/qsslsocket_openssl_symbols_p.h ++++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h +@@ -440,7 +440,7 @@ STACK_OF(X509) *q_X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx); + // Diffie-Hellman support + DH *q_DH_new(); + void q_DH_free(DH *dh); +-DH *q_d2i_DHparams(DH **a, unsigned char **pp, long length); ++DH *q_d2i_DHparams(DH **a, const unsigned char **pp, long length); + + BIGNUM *q_BN_bin2bn(const unsigned char *s, int len, BIGNUM *ret); + #define q_SSL_CTX_set_tmp_dh(ctx, dh) q_SSL_CTX_ctrl((ctx), SSL_CTRL_SET_TMP_DH, 0, (char *)dh) +-- +2.3.1 + diff --git a/packages/qt5-declarative-git/PKGBUILD b/packages/qt5-declarative-git/PKGBUILD new file mode 100644 index 0000000..154e8f8 --- /dev/null +++ b/packages/qt5-declarative-git/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Jerome Leclanche +# Contributor: Andrea Scarpino +# Contributor: Pier Luigi Fiorini + +_pkgname=qt5-declarative +pkgname=$_pkgname-git +pkgver=v5.4.1.766.g09e903e +pkgrel=1 +pkgdesc="A cross-platform application and UI framework (QtQml, QtQuick)" +arch=("i686" "x86_64") +url="https://qt-project.org/" +license=("GPL3" "LGPL") +depends=("qt5-xmlpatterns-git") +makedepends=("git") +provides=("$_pkgname") +conflicts=("$_pkgname") +source=("$_pkgname::git://gitorious.org/qt/qtdeclarative.git#branch=5.5") +sha256sums=("SKIP") + +pkgver() { + cd "$srcdir/$_pkgname" + git describe --always | sed "s/-/./g" +} + +prepare() { + cd "$srcdir/$_pkgname" + mkdir -p build + cd build + qmake .. + make +} + +package() { + cd "$srcdir/$_pkgname" + cd build + make INSTALL_ROOT="$pkgdir" install +} diff --git a/packages/qt5-graphicaleffects-git/PKGBUILD b/packages/qt5-graphicaleffects-git/PKGBUILD new file mode 100644 index 0000000..1b4f38b --- /dev/null +++ b/packages/qt5-graphicaleffects-git/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Jerome Leclanche +# Contributor: Andrea Scarpino +# Contributor: Pier Luigi Fiorini + +_pkgname=qt5-graphicaleffects +pkgname=$_pkgname-git +pkgver=v5.4.1.9.g4ee79d3 +pkgrel=1 +pkgdesc="A cross-platform application and UI framework (QtGraphicalEffects)" +arch=("i686" "x86_64") +url="https://qt-project.org/" +license=("GPL3" "LGPL") +depends=("qt5-declarative-git") +makedepends=("git") +provides=("$_pkgname") +conflicts=("$_pkgname") +source=("$_pkgname::git://gitorious.org/qt/qtgraphicaleffects.git#branch=5.5") +sha256sums=("SKIP") + +pkgver() { + cd "$srcdir/$_pkgname" + git describe --always | sed "s/-/./g" +} + +prepare() { + cd "$srcdir/$_pkgname" + mkdir -p build + cd build + qmake .. + make +} + +package() { + cd "$srcdir/$_pkgname" + cd build + make INSTALL_ROOT="$pkgdir" install +} diff --git a/packages/qt5-pim-eds-bzr/PKGBUILD b/packages/qt5-pim-eds-bzr/PKGBUILD new file mode 100644 index 0000000..7aa84e4 --- /dev/null +++ b/packages/qt5-pim-eds-bzr/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Michael Spencer + +pkgname=qt5-pim-eds-bzr +pkgver=0.1.r +pkgrel=1 +pkgdesc="EDS backend for QtOrganizer/QtPIM" +groups=('qt' 'qt5') +arch=('i686' 'x86_64') +url="https://launchpad.net/qtorganizer5-eds" +license=('GPL3' 'LGPL') +depends=('qt5-base' 'qt5-declarative' 'qt5-pim') +makedepends=('bzr') +_bzrname="qtorganizer5-eds" +source=("$_bzrname::bzr+http://bazaar.launchpad.net/~phablet-team/$_bzrname/trunk/") +md5sums=('SKIP') + +pkgver() { + cd ${srcdir}/${_gitname} + printf "0.1.r%s" "$(bzr revno)" +} + +build() { + cd ${srcdir}/${_bzrname} + cmake . + make +} + +package() { + cd ${srcdir}/${_bzrname} + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/packages/qt5-pim-git/PKGBUILD b/packages/qt5-pim-git/PKGBUILD new file mode 100644 index 0000000..8d0cbf1 --- /dev/null +++ b/packages/qt5-pim-git/PKGBUILD @@ -0,0 +1,39 @@ +# Maintainer: Pier Luigi Fiorini + +pkgname=qt5-pim-git +pkgver=v5.0.0.beta1.r156.g18e3d74 +pkgrel=2 +pkgdesc="A cross-platform application and UI framework (QtPim)" +groups=('qt' 'qt5') +arch=('i686' 'x86_64') +url="http://qt-project.org/" +license=('GPL3' 'LGPL') +depends=('qt5-base' 'qt5-declarative') +makedepends=('git') +replaces=('qt5-qtpim-git') +conflicts=('qt5-pim') +provides=('qt5-pim') +options=('!libtool') +_gitroot="git://code.qt.io/qt/qtpim.git" +_gitname="qt5-pim" +source=(${_gitname}::${_gitroot}#branch=dev) +md5sums=('SKIP') + +pkgver() { + cd ${srcdir}/${_gitname} + ( set -o pipefail + git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' || + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + ) +} + +build() { + cd ${srcdir}/${_gitname} + qmake + make +} + +package() { + cd ${srcdir}/${_gitname} + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/packages/qt5-quickcontrols-git/PKGBUILD b/packages/qt5-quickcontrols-git/PKGBUILD new file mode 100644 index 0000000..3d667f5 --- /dev/null +++ b/packages/qt5-quickcontrols-git/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Jerome Leclanche +# Contributor: Andrea Scarpino +# Contributor: Pier Luigi Fiorini + +_pkgname=qt5-quickcontrols +pkgname=$_pkgname-git +pkgver=v5.4.1.82.gb80076c +pkgrel=1 +pkgdesc="A cross-platform application and UI framework (QtQuick)" +arch=("i686" "x86_64") +url="https://qt-project.org/" +license=("GPL3" "LGPL") +depends=("qt5-declarative-git") +makedepends=("git") +provides=("$_pkgname") +conflicts=("$_pkgname") +source=("$_pkgname::git://gitorious.org/qt/qtquickcontrols.git#branch=5.5") +sha256sums=("SKIP") + +pkgver() { + cd "$srcdir/$_pkgname" + git describe --always | sed "s/-/./g" +} + +build() { + cd "$srcdir/$_pkgname" + mkdir -p build + cd build + qmake .. + make +} + +package() { + cd "$srcdir/$_pkgname" + cd build + make INSTALL_ROOT="$pkgdir" install +} diff --git a/packages/qt5-svg-git/PKGBUILD b/packages/qt5-svg-git/PKGBUILD new file mode 100644 index 0000000..059c355 --- /dev/null +++ b/packages/qt5-svg-git/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Jerome Leclanche +# Contributor: Andrea Scarpino +# Contributor: Pier Luigi Fiorini + +_pkgname=qt5-svg +pkgname=$_pkgname-git +pkgver=v5.3.0.beta1.4.g90c3421 +pkgrel=1 +pkgdesc="A cross-platform application and UI framework (QtSvg)" +arch=("i686" "x86_64") +url="https://qt-project.org/" +license=("GPL3" "LGPL") +depends=("qt5-base-git") +makedepends=("git") +provides=("$_pkgname") +conflicts=("$_pkgname") +source=("$_pkgname::git://gitorious.org/qt/qtsvg.git#branch=5.5") +sha256sums=("SKIP") + +pkgver() { + cd "$srcdir/$_pkgname" + git describe --always | sed "s/-/./g" +} + +prepare() { + cd "$srcdir/$_pkgname" + mkdir -p build + cd build + qmake .. + make +} + +package() { + cd "$srcdir/$_pkgname" + cd build + make INSTALL_ROOT="$pkgdir" install +} diff --git a/packages/qt5-wayland-dev-git/PKGBUILD b/packages/qt5-wayland-dev-git/PKGBUILD new file mode 100644 index 0000000..5233fdc --- /dev/null +++ b/packages/qt5-wayland-dev-git/PKGBUILD @@ -0,0 +1,94 @@ +# Maintainer: Mateusz Paluszkiewicz +# Contributor: Swift Geek +# Contributor: Jerome Leclanche +# Contributor: Andrea Scarpino +# Contributor: Pier Luigi Fiorini +# Contributor: Gustavo + +_pkgname=qt5-wayland +pkgname=${_pkgname}-dev-git +pkgver=5.4.1.r45.gd5500d9 +pkgrel=1 +pkgdesc="A cross-platform application and UI framework (QtWayland) - Version for Developers!" +arch=("i686" "x86_64") +url="https://qt.gitorious.org/qt/qtwayland/" +license=("GPL3" "LGPL") +depends=("qt5-base" "qt5-declarative" "libxcomposite" "wayland" "libdrm" "libxkbcommon" "mesa") +optdepends=("weston") +makedepends=("git") +provides=("${_pkgname}") +conflicts=("${_pkgname}" "${_pkgname}-git") +options=("staticlibs" "libtool") + +sha256sums=("SKIP") + +# Definition with userside version of Qt5 +_qt5_userversion=`pkg-config --modversion Qt5Core` + +source=("$_pkgname::git://gitorious.org/qt/qtwayland.git#branch=5.5") + +# Number of real cores * number of processors = :) # TODO : Repair +#_cores_multiplication_processors=$(( `grep "^core id" /proc/cpuinfo | sort -u | wc -l` * `grep "^physical id" /proc/cpuinfo | sort -u | wc -l` )) + + +pkgver() { + cd "${_pkgname}" + #pkg ver withtout 'v' prefix + git describe --long | sed -r 's/^v//;s/([^-]*-g)/r\1/;s/-/./g' +} + +prepare() { + warning "REMEMBER! If you want use other version, change line 28!" + + cd "${_pkgname}" + + # Repair for Qt5.3.2 + warning "Enabling hacks due to FS#38819. All packages relying on this one will need simlar one\n (not needed to just run Qt5 apps in wayland)" + if [ ${_qt5_userversion} == "5.3.2" ] + then + msg "Repair qwaylandscreen.cpp for Qt 5.3.2" + sed -i "s/QWindowSystemInterface::handleScreenGeometryChange(screen(), mGeometry, mGeometry)/QWindowSystemInterface::handleScreenGeometryChange(screen(), mGeometry)/" \ + ./src/client/qwaylandscreen.cpp + fi +} + +build() { + cd "${_pkgname}" + + # Replace Qt version to user version (Qt) + msg "Patching QtWayland to user version QT" + sed -i "/MODULE_VERSION/c\MODULE_VERSION = ${_qt5_userversion}" .qmake.conf + + mkdir build + cd build + + export QT_SELECT=5 + msg "Preparing library... (QMAKE_LIBS_PRIVATE is NEEDED now)" + qmake CONFIG+=wayland-compositor QMAKE_LIBS_PRIVATE+=-lXrender .. + + msg "Build library..." + make -j`nproc` +} + +package() { + cd "${_pkgname}" + cd build + + msg "Packing library..." + make INSTALL_ROOT="${pkgdir}" install + + # Create custom directories + mkdir -p ${pkgdir}/usr/share/licenses/qt5-wayland/ + + # Install generated private headers + #cp ./include/QtCompositor/${_qt5_userversion}/QtCompositor/private/{qwayland-server-*,*protocol*}.h ${pkgdir}/usr/include/qt/QtCompositor/${_qt5_userversion}/QtCompositor/private/ + + # TODO: Needed? + cp ./include/QtCompositor/${_qt5_userversion}/QtCompositor/private/*.h ${pkgdir}/usr/include/qt/QtCompositor/${_qt5_userversion}/QtCompositor/private/ + + # Back to main directory + cd ../ + + # Copy custom files + cp ./LGPL_EXCEPTION.txt ${pkgdir}/usr/share/licenses/qt5-wayland/ +} diff --git a/packages/qt5-xmlpatterns-git/PKGBUILD b/packages/qt5-xmlpatterns-git/PKGBUILD new file mode 100644 index 0000000..845616d --- /dev/null +++ b/packages/qt5-xmlpatterns-git/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Jerome Leclanche +# Contributor: Andrea Scarpino +# Contributor: Pier Luigi Fiorini + +_pkgname=qt5-xmlpatterns +pkgname=$_pkgname-git +pkgver=v5.4.1.18.g5e53b39 +pkgrel=1 +pkgdesc="A cross-platform application and UI framework (QtXmlPatterns)" +arch=("i686" "x86_64") +url="https://qt-project.org/" +license=("GPL3" "LGPL") +depends=("qt5-base-git") +makedepends=("git" "python") +provides=("$_pkgname") +conflicts=("$_pkgname") +source=("$_pkgname::git://gitorious.org/qt/qtxmlpatterns.git#branch=5.5") +sha256sums=("SKIP") + +pkgver() { + cd "$srcdir/$_pkgname" + git describe --always | sed "s/-/./g" +} + +prepare() { + cd "$srcdir/$_pkgname" + mkdir -p build + cd build + qmake .. + make +} + +package() { + cd "$srcdir/$_pkgname" + cd build + make INSTALL_ROOT="$pkgdir" install +} diff --git a/packages/xdg-app-git/PKGBUILD b/packages/xdg-app-git/PKGBUILD new file mode 100644 index 0000000..d6448e0 --- /dev/null +++ b/packages/xdg-app-git/PKGBUILD @@ -0,0 +1,38 @@ +_pkgname=xdg-app +pkgname=$_pkgname-git +pkgver=97747a3 +pkgrel=3 +url="https://github.com/alexlarsson/xdg-app/" +pkgdesc='Application deployment framework for desktop apps.' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +provides=('xdg-app') +conflicts=("xdg-app") +makedepends=('pkg-config' 'gtk-doc' 'git') +depends=('glib2>=2.43' + 'libgsystem' + 'glib-networking' + 'ostree') + +source=("${_pkgname}::git+https://github.com/alexlarsson/xdg-app.git") +md5sums=('SKIP') + +# TODO: Uncomment later +pkgver () { + cd "${srcdir}/${_pkgname}" + # git describe --long | sed -r 's/^v//;s/([^-]*-g)/r\1/;s/-/./g' + git rev-parse --short HEAD +} + +build() { + cd "${srcdir}/${_pkgname}" + ./autogen.sh \ + --prefix=/usr \ + --with-systemdsystemunitdir=/usr/lib/systemd/system + make +} + +package() { + cd "${srcdir}/${_pkgname}" + make install DESTDIR="$pkgdir" +} diff --git a/post-install b/post-install new file mode 100644 index 0000000..aba83f7 --- /dev/null +++ b/post-install @@ -0,0 +1 @@ +systemctl enable gdm