audio: Remove bmpx
Upstream vanished some time ago (2008?) and this is forever stuck on the unmaintained and now somewhat broken 0.10 branch of GStreamer. This is also nearly unique to pkgsrc at this point in its existence. PKGREVISION= 80
This commit is contained in:
nia
parent
6772a5953e
commit
937ee68e9a
40 changed files with 1 additions and 1417 deletions
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.581 2020/01/19 01:04:52 nia Exp $
|
||||
# $NetBSD: Makefile,v 1.582 2020/01/19 22:46:43 nia Exp $
|
||||
#
|
||||
|
||||
COMMENT= Audio tools
|
||||
|
|
@ -43,7 +43,6 @@ SUBDIR+= bmp-mac
|
|||
SUBDIR+= bmp-musepack
|
||||
SUBDIR+= bmp-pulse
|
||||
SUBDIR+= bmp-scrobbler
|
||||
SUBDIR+= bmpx
|
||||
SUBDIR+= buzztrax
|
||||
SUBDIR+= cam
|
||||
SUBDIR+= cantata
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
BMPx is a media player that features support for specifications
|
||||
like XDS DnD, XSPF and DBus. BMPx is highly interoperable and
|
||||
integrates well with other applications and a variety of desktop
|
||||
environments.
|
||||
|
Before Width: | Height: | Size: 205 B |
|
|
@ -1,62 +0,0 @@
|
|||
# $NetBSD: Makefile,v 1.109 2020/01/12 20:20:02 ryoon Exp $
|
||||
|
||||
DISTNAME= bmpx-0.40.14
|
||||
PKGREVISION= 80
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= http://files.backtrace.info/releases/0.40/
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
MAINTAINER= pkgsrc-users@NetBSD.org
|
||||
#HOMEPAGE= http://bmpx.backtrace.info/site/BMPx_Homepage
|
||||
COMMENT= Audio player to be used with a frontend or as a daemon
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_LANGUAGES= c c++11
|
||||
USE_TOOLS+= gmake intltool msgfmt pkg-config zip
|
||||
USE_LIBTOOL= yes
|
||||
USE_PKGLOCALEDIR= yes
|
||||
# the following is a fix for nonsense in the configure script
|
||||
CPPFLAGS+= -I${BUILDLINK_PREFIX.cdparanoia}/include/cdparanoia
|
||||
|
||||
CHECK_WRKREF_SKIP= bin/beep-media-player-2
|
||||
CHECK_WRKREF_SKIP+= bin/bmp2
|
||||
CHECK_WRKREF_SKIP+= libexec/beep-media-player-2-bin
|
||||
|
||||
GCC_REQD+= 4.8
|
||||
|
||||
.include "../../mk/bsd.fast.prefs.mk"
|
||||
.if ${OPSYS} == "Linux"
|
||||
.include "../../audio/alsa-lib/buildlink3.mk"
|
||||
.endif
|
||||
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
|
||||
.include "../../audio/cdparanoia/buildlink3.mk"
|
||||
.include "../../audio/libofa/buildlink3.mk"
|
||||
BUILDLINK_API_DEPENDS.taglib+= taglib>=1.4
|
||||
.include "../../audio/taglib/buildlink3.mk"
|
||||
.include "../../databases/sqlite3/buildlink3.mk"
|
||||
.include "../../devel/boost-libs/buildlink3.mk"
|
||||
BUILDLINK_API_DEPENDS.glibmm+= glibmm>=2.8.3
|
||||
.include "../../devel/glibmm/buildlink3.mk"
|
||||
BUILDLINK_API_DEPENDS.libglademm+= libglademm>=2.6.0
|
||||
.include "../../devel/libglademm/buildlink3.mk"
|
||||
BUILDLINK_API_DEPENDS.librsvg+= librsvg>=2.14.0
|
||||
.include "../../devel/libsexymm/buildlink3.mk"
|
||||
.include "../../graphics/librsvg/buildlink3.mk"
|
||||
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
|
||||
.include "../../net/libsoup/buildlink3.mk"
|
||||
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.12.0
|
||||
.include "../../x11/gtk2/buildlink3.mk"
|
||||
BUILDLINK_API_DEPENDS.gtkmm+= gtkmm>=2.10.0
|
||||
.include "../../x11/gtkmm/buildlink3.mk"
|
||||
BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.8
|
||||
.include "../../x11/startup-notification/buildlink3.mk"
|
||||
BUILDLINK_API_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.9
|
||||
.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
|
||||
BUILDLINK_API_DEPENDS.gstreamer0.10+= gstreamer0.10>=0.10.11
|
||||
.include "../../multimedia/gstreamer0.10/buildlink3.mk"
|
||||
BUILDLINK_API_DEPENDS.dbus+= dbus>=0.93
|
||||
.include "../../sysutils/dbus/buildlink3.mk"
|
||||
.include "../../sysutils/dbus-glib/buildlink3.mk"
|
||||
.include "../../x11/libSM/buildlink3.mk"
|
||||
.include "../../x11/libX11/buildlink3.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
241
audio/bmpx/PLIST
241
audio/bmpx/PLIST
|
|
@ -1,241 +0,0 @@
|
|||
@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:10:28 joerg Exp $
|
||||
bin/beep-media-player-2
|
||||
bin/bmp-play-files-2.0
|
||||
bin/bmp-play-uris-2.0
|
||||
bin/bmp2
|
||||
include/bmp-2.0/bmp/bmp.hh
|
||||
include/bmp-2.0/bmp/dbus.hh
|
||||
include/bmp-2.0/bmp/types/types-basic.hh
|
||||
include/bmp-2.0/bmp/types/types-bookmarks.hh
|
||||
include/bmp-2.0/bmp/types/types-database.hh
|
||||
include/bmp-2.0/bmp/types/types-lastfm.hh
|
||||
include/bmp-2.0/bmp/types/types-library.hh
|
||||
include/bmp-2.0/bmp/types/types-network.hh
|
||||
include/bmp-2.0/bmp/types/types-ui.hh
|
||||
include/bmp-2.0/bmp/types/types-xspf.hh
|
||||
lib/bmpx/plugins/taglib/libtaglib_plugin_asf.la
|
||||
lib/bmpx/plugins/taglib/libtaglib_plugin_flac.la
|
||||
lib/bmpx/plugins/taglib/libtaglib_plugin_mp3.la
|
||||
lib/bmpx/plugins/taglib/libtaglib_plugin_mp4.la
|
||||
lib/bmpx/plugins/taglib/libtaglib_plugin_mpc.la
|
||||
lib/bmpx/plugins/taglib/libtaglib_plugin_ogg.la
|
||||
lib/bmpx/plugins/vfs/container/libcontainer_folder.la
|
||||
lib/bmpx/plugins/vfs/container/libcontainer_m3u.la
|
||||
lib/bmpx/plugins/vfs/container/libcontainer_pls.la
|
||||
lib/bmpx/plugins/vfs/container/libcontainer_xspf.la
|
||||
lib/bmpx/plugins/vfs/transport/libtransport_file.la
|
||||
lib/bmpx/plugins/vfs/transport/libtransport_http.la
|
||||
lib/pkgconfig/bmp-2.0.pc
|
||||
libexec/beep-media-player-2-bin
|
||||
libexec/beep-media-player-2-sentinel
|
||||
man/man1/beep-media-player-2.1
|
||||
share/applications/bmp-2.0-offline.desktop
|
||||
share/applications/bmp-2.0.desktop
|
||||
share/applications/bmp-play-2.0.desktop
|
||||
share/bmpx/glade/dialog-add-podcast.glade
|
||||
share/bmpx/glade/dialog-bounce-adjust.glade
|
||||
share/bmpx/glade/dialog-equalizer.glade
|
||||
share/bmpx/glade/dialog-export.glade
|
||||
share/bmpx/glade/dialog-filebrowser.glade
|
||||
share/bmpx/glade/dialog-gsterror.glade
|
||||
share/bmpx/glade/dialog-lastfm-recommend.glade
|
||||
share/bmpx/glade/dialog-lastfm-tag.glade
|
||||
share/bmpx/glade/dialog-play-uri.glade
|
||||
share/bmpx/glade/dialog-progress.glade
|
||||
share/bmpx/glade/dialog-remove-update-podcast.glade
|
||||
share/bmpx/glade/dialog-simple-entry.glade
|
||||
share/bmpx/glade/dialog-simple-progress.glade
|
||||
share/bmpx/glade/dialog-track-details.glade
|
||||
share/bmpx/glade/library-ui-modify-import.glade
|
||||
share/bmpx/glade/main.glade
|
||||
share/bmpx/glade/preferences.glade
|
||||
share/bmpx/icons/themes/darksphere/icon_player_128.png
|
||||
share/bmpx/icons/themes/darksphere/icon_player_16.png
|
||||
share/bmpx/icons/themes/darksphere/icon_player_32.png
|
||||
share/bmpx/icons/themes/darksphere/icon_player_48.png
|
||||
share/bmpx/icons/themes/darksphere/icon_player_64.png
|
||||
share/bmpx/icons/themes/darksphere/icon_playlist_128.png
|
||||
share/bmpx/icons/themes/darksphere/icon_playlist_16.png
|
||||
share/bmpx/icons/themes/darksphere/icon_playlist_32.png
|
||||
share/bmpx/icons/themes/darksphere/icon_playlist_48.png
|
||||
share/bmpx/icons/themes/darksphere/icon_playlist_64.png
|
||||
share/bmpx/icons/themes/display/icon_player_128.png
|
||||
share/bmpx/icons/themes/display/icon_player_16.png
|
||||
share/bmpx/icons/themes/display/icon_player_32.png
|
||||
share/bmpx/icons/themes/display/icon_player_48.png
|
||||
share/bmpx/icons/themes/display/icon_player_64.png
|
||||
share/bmpx/icons/themes/display/icon_playlist_128.png
|
||||
share/bmpx/icons/themes/display/icon_playlist_16.png
|
||||
share/bmpx/icons/themes/display/icon_playlist_32.png
|
||||
share/bmpx/icons/themes/display/icon_playlist_48.png
|
||||
share/bmpx/icons/themes/display/icon_playlist_64.png
|
||||
share/bmpx/icons/themes/plastic/icon_player_128.png
|
||||
share/bmpx/icons/themes/plastic/icon_player_16.png
|
||||
share/bmpx/icons/themes/plastic/icon_player_32.png
|
||||
share/bmpx/icons/themes/plastic/icon_player_48.png
|
||||
share/bmpx/icons/themes/plastic/icon_player_64.png
|
||||
share/bmpx/icons/themes/plastic/icon_playlist_128.png
|
||||
share/bmpx/icons/themes/plastic/icon_playlist_16.png
|
||||
share/bmpx/icons/themes/plastic/icon_playlist_32.png
|
||||
share/bmpx/icons/themes/plastic/icon_playlist_48.png
|
||||
share/bmpx/icons/themes/plastic/icon_playlist_64.png
|
||||
share/bmpx/icons/themes/red/icon_library_128.png
|
||||
share/bmpx/icons/themes/red/icon_library_16.png
|
||||
share/bmpx/icons/themes/red/icon_library_32.png
|
||||
share/bmpx/icons/themes/red/icon_library_48.png
|
||||
share/bmpx/icons/themes/red/icon_library_64.png
|
||||
share/bmpx/icons/themes/red/icon_player_128.png
|
||||
share/bmpx/icons/themes/red/icon_player_16.png
|
||||
share/bmpx/icons/themes/red/icon_player_32.png
|
||||
share/bmpx/icons/themes/red/icon_player_48.png
|
||||
share/bmpx/icons/themes/red/icon_player_64.png
|
||||
share/bmpx/icons/themes/red/icon_playlist_128.png
|
||||
share/bmpx/icons/themes/red/icon_playlist_16.png
|
||||
share/bmpx/icons/themes/red/icon_playlist_32.png
|
||||
share/bmpx/icons/themes/red/icon_playlist_48.png
|
||||
share/bmpx/icons/themes/red/icon_playlist_64.png
|
||||
share/bmpx/icons/themes/red/icon_streams_128.png
|
||||
share/bmpx/icons/themes/red/icon_streams_16.png
|
||||
share/bmpx/icons/themes/red/icon_streams_32.png
|
||||
share/bmpx/icons/themes/red/icon_streams_48.png
|
||||
share/bmpx/icons/themes/red/icon_streams_64.png
|
||||
share/bmpx/icons/themes/tango/icon_library_128.png
|
||||
share/bmpx/icons/themes/tango/icon_library_16.png
|
||||
share/bmpx/icons/themes/tango/icon_library_32.png
|
||||
share/bmpx/icons/themes/tango/icon_library_48.png
|
||||
share/bmpx/icons/themes/tango/icon_library_64.png
|
||||
share/bmpx/icons/themes/tango/icon_player_128.png
|
||||
share/bmpx/icons/themes/tango/icon_player_16.png
|
||||
share/bmpx/icons/themes/tango/icon_player_32.png
|
||||
share/bmpx/icons/themes/tango/icon_player_48.png
|
||||
share/bmpx/icons/themes/tango/icon_player_64.png
|
||||
share/bmpx/icons/themes/tango/icon_playlist_128.png
|
||||
share/bmpx/icons/themes/tango/icon_playlist_16.png
|
||||
share/bmpx/icons/themes/tango/icon_playlist_32.png
|
||||
share/bmpx/icons/themes/tango/icon_playlist_48.png
|
||||
share/bmpx/icons/themes/tango/icon_playlist_64.png
|
||||
share/bmpx/icons/themes/tango/icon_streams_128.png
|
||||
share/bmpx/icons/themes/tango/icon_streams_16.png
|
||||
share/bmpx/icons/themes/tango/icon_streams_32.png
|
||||
share/bmpx/icons/themes/tango/icon_streams_48.png
|
||||
share/bmpx/icons/themes/tango/icon_streams_64.png
|
||||
share/bmpx/icons/tray-icons/tray-icon-default.png
|
||||
share/bmpx/icons/tray-icons/tray-icon-paused.png
|
||||
share/bmpx/icons/tray-icons/tray-icon-playing.png
|
||||
share/bmpx/images/audio-default.png
|
||||
share/bmpx/images/cdda/audiocd-big.png
|
||||
share/bmpx/images/cdda/audiocd-unplayable.png
|
||||
share/bmpx/images/lastfm/artist-unknown.png
|
||||
share/bmpx/images/lastfm/audioscrobbler.png
|
||||
share/bmpx/images/lastfm/lastfm-album.png
|
||||
share/bmpx/images/lastfm/lastfm-artist.png
|
||||
share/bmpx/images/lastfm/lastfm-friend.png
|
||||
share/bmpx/images/lastfm/lastfm-mainuser.png
|
||||
share/bmpx/images/lastfm/lastfm-neighbour.png
|
||||
share/bmpx/images/lastfm/lastfm-recommended-radio.png
|
||||
share/bmpx/images/lastfm/lastfm-station-small.png
|
||||
share/bmpx/images/lastfm/lastfm-station.png
|
||||
share/bmpx/images/lastfm/lastfm-tag.png
|
||||
share/bmpx/images/lastfm/lastfm-track.png
|
||||
share/bmpx/images/lastfm/lastfm-user.png
|
||||
share/bmpx/images/logo-about.png
|
||||
share/bmpx/images/logo-splash.png
|
||||
share/bmpx/images/main/paused.gif
|
||||
share/bmpx/images/podcast/feed-default.png
|
||||
share/bmpx/images/podcast/feed-expired.png
|
||||
share/bmpx/images/podcast/updating.png
|
||||
share/bmpx/images/rating/stars_0.png
|
||||
share/bmpx/images/rating/stars_1.png
|
||||
share/bmpx/images/rating/stars_2.png
|
||||
share/bmpx/images/rating/stars_3.png
|
||||
share/bmpx/images/rating/stars_4.png
|
||||
share/bmpx/images/rating/stars_5.png
|
||||
share/bmpx/images/sources/audiocd.png
|
||||
share/bmpx/images/sources/jamendo.png
|
||||
share/bmpx/images/sources/lastfm.png
|
||||
share/bmpx/images/sources/library.png
|
||||
share/bmpx/images/sources/playlist.png
|
||||
share/bmpx/images/sources/podcasts.png
|
||||
share/bmpx/images/sources/radio.png
|
||||
share/bmpx/images/stock/approve-partial.png
|
||||
share/bmpx/images/stock/approve.png
|
||||
share/bmpx/images/stock/artist-blackstar.png
|
||||
share/bmpx/images/stock/artist-mb.png
|
||||
share/bmpx/images/stock/artist-multiple.png
|
||||
share/bmpx/images/stock/artist.png
|
||||
share/bmpx/images/stock/audio.png
|
||||
share/bmpx/images/stock/bmp.png
|
||||
share/bmpx/images/stock/cdrom.png
|
||||
share/bmpx/images/stock/clear.png
|
||||
share/bmpx/images/stock/eek.png
|
||||
share/bmpx/images/stock/equalizer.png
|
||||
share/bmpx/images/stock/feed.png
|
||||
share/bmpx/images/stock/jamendo.png
|
||||
share/bmpx/images/stock/lastfm-ban.png
|
||||
share/bmpx/images/stock/lastfm-love.png
|
||||
share/bmpx/images/stock/lastfm-skip.png
|
||||
share/bmpx/images/stock/lastfm.png
|
||||
share/bmpx/images/stock/library.png
|
||||
share/bmpx/images/stock/lyrics.png
|
||||
share/bmpx/images/stock/musicbrainz.png
|
||||
share/bmpx/images/stock/play.png
|
||||
share/bmpx/images/stock/playlist.png
|
||||
share/bmpx/images/stock/repeat.png
|
||||
share/bmpx/images/stock/search.png
|
||||
share/bmpx/images/stock/shuffle.png
|
||||
share/bmpx/images/stock/silk-add.png
|
||||
share/bmpx/images/stock/silk-application_edit.png
|
||||
share/bmpx/images/stock/silk-attach.png
|
||||
share/bmpx/images/stock/silk-cart_put.png
|
||||
share/bmpx/images/stock/silk-cd_delete.png
|
||||
share/bmpx/images/stock/silk-cd_edit.png
|
||||
share/bmpx/images/stock/silk-delete.png
|
||||
share/bmpx/images/stock/silk-disk.png
|
||||
share/bmpx/images/stock/silk-drive.png
|
||||
share/bmpx/images/stock/silk-exclamation.png
|
||||
share/bmpx/images/stock/silk-feed_add.png
|
||||
share/bmpx/images/stock/silk-feed_delete.png
|
||||
share/bmpx/images/stock/silk-feed_disk.png
|
||||
share/bmpx/images/stock/silk-folder.png
|
||||
share/bmpx/images/stock/silk-new.png
|
||||
share/bmpx/images/stock/silk-picture.png
|
||||
share/bmpx/images/stock/silk-plugin.png
|
||||
share/bmpx/images/stock/silk-plugin_disabled.png
|
||||
share/bmpx/images/stock/silk-server_database.png
|
||||
share/bmpx/images/stock/silk-world_link.png
|
||||
share/bmpx/images/stock/tag.png
|
||||
share/bmpx/images/stock/track.png
|
||||
share/bmpx/images/stock/undo.png
|
||||
share/bmpx/images/stock/web.png
|
||||
share/bmpx/images/stock/xiph.png
|
||||
share/bmpx/images/svg/button-background.svg
|
||||
share/bmpx/images/svg/button-outline.svg
|
||||
share/bmpx/images/throbber-small.gif
|
||||
share/bmpx/images/throbber.gif
|
||||
share/bmpx/images/video-default.png
|
||||
share/dbus-1/services/org.beepmediaplayer.sentinel.service
|
||||
share/dbus-1/services/org.mpris.bmp.service
|
||||
share/icons/hicolor/48x48/apps/bmpx.png
|
||||
share/locale/af/LC_MESSAGES/bmpx.mo
|
||||
share/locale/cs/LC_MESSAGES/bmpx.mo
|
||||
share/locale/da/LC_MESSAGES/bmpx.mo
|
||||
share/locale/de/LC_MESSAGES/bmpx.mo
|
||||
share/locale/el/LC_MESSAGES/bmpx.mo
|
||||
share/locale/es/LC_MESSAGES/bmpx.mo
|
||||
share/locale/et/LC_MESSAGES/bmpx.mo
|
||||
share/locale/fi/LC_MESSAGES/bmpx.mo
|
||||
share/locale/fr/LC_MESSAGES/bmpx.mo
|
||||
share/locale/hu/LC_MESSAGES/bmpx.mo
|
||||
share/locale/it/LC_MESSAGES/bmpx.mo
|
||||
share/locale/ja/LC_MESSAGES/bmpx.mo
|
||||
share/locale/ka/LC_MESSAGES/bmpx.mo
|
||||
share/locale/lt/LC_MESSAGES/bmpx.mo
|
||||
share/locale/nl/LC_MESSAGES/bmpx.mo
|
||||
share/locale/pl/LC_MESSAGES/bmpx.mo
|
||||
share/locale/pt_BR/LC_MESSAGES/bmpx.mo
|
||||
share/locale/ro/LC_MESSAGES/bmpx.mo
|
||||
share/locale/ru/LC_MESSAGES/bmpx.mo
|
||||
share/locale/sv/LC_MESSAGES/bmpx.mo
|
||||
share/locale/th_TH/LC_MESSAGES/bmpx.mo
|
||||
share/locale/zh_CN/LC_MESSAGES/bmpx.mo
|
||||
@pkgdir share/bmpx/data
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
$NetBSD: distinfo,v 1.22 2016/12/22 20:58:40 joerg Exp $
|
||||
|
||||
SHA1 (bmpx-0.40.14.tar.bz2) = 3284843c45cab302f414663a5cb31eb4373d07c7
|
||||
RMD160 (bmpx-0.40.14.tar.bz2) = 12a9939d53b58a43ee9deefa43188ac6b33dae72
|
||||
SHA512 (bmpx-0.40.14.tar.bz2) = 6678999f42b1817ea45db23196a836b8c41006493bfe3caf2e586bffc7a05584ac1af439269d29da1879b90cdf7abbc9c7b4f056991bae9e7e961300ba4be938
|
||||
Size (bmpx-0.40.14.tar.bz2) = 1776299 bytes
|
||||
SHA1 (patch-aa) = 2d1fb7d2ce431aff6611ecf0aaa24ac0bf928ac1
|
||||
SHA1 (patch-ab) = 76a896a88853c4dfaa971b1f7bbf11f3c835e42a
|
||||
SHA1 (patch-ac) = 06d8c9d8b653f6f9eb089c8f6ba3676e42e74668
|
||||
SHA1 (patch-ad) = c4613d7fd02f912ed902346558ea592d64d584bb
|
||||
SHA1 (patch-ae) = b4bfb4b92735cf4f45579c50a7a71143d3bbb6c7
|
||||
SHA1 (patch-af) = 52c93f49490c50af9666032407ca41d944287214
|
||||
SHA1 (patch-ag) = fa089ab5d823198527a05bba44b484e07d9067f5
|
||||
SHA1 (patch-ah) = d8a7085943f3795fe5fe85fa94f4e93434eca329
|
||||
SHA1 (patch-ai) = 0e8a20bb8d18f14da58f2681a2fb6ae141e9d66d
|
||||
SHA1 (patch-aj) = e6a9bd43cac01df156a95a688f8fd99e1383bb63
|
||||
SHA1 (patch-ak) = 10a363145c7e9f75e07ca69fc38515413fc606f8
|
||||
SHA1 (patch-library_cc) = 26cbced97d7669081eb4ff60c062a34c258c7337
|
||||
SHA1 (patch-mcs_gtk-bind.h) = e9417364df34f8baea6b279b5bc1d1b4ba0d966a
|
||||
SHA1 (patch-plugins_vfs_container_libcontainer__folder.cc) = 0a179855b59fc382de68c6cbfc02cf3695dc7a8e
|
||||
SHA1 (patch-src_amazon.cc) = b8e275f034686b39d8eb15c97ce0295fd9559d42
|
||||
SHA1 (patch-src_debug.cc) = f951e16a43f7d6fed4e806486bb6c8bc6f13ca89
|
||||
SHA1 (patch-src_debug.hh) = 58d86f34785d566262b95834cd784b064b47247f
|
||||
SHA1 (patch-src_dialog-progress_hh) = cfb3caa62cbca65bc6e8c70543ad20d857f45ce5
|
||||
SHA1 (patch-src_dialog-simple-progress_hh) = 990f48d7052f2fca64f1247ee475a2b40d5bd9fe
|
||||
SHA1 (patch-src_hal_hh) = cb4046f9fca8af792641fd04f86f3efd52f58929
|
||||
SHA1 (patch-src_jamendodata-libxml2-sax_cc) = 888416fd225b58f593095f3fbef1580c5064b1b8
|
||||
SHA1 (patch-src_lastfm.cc) = 8ece9937f2ef162398fdd310f5c4c04d3940e4aa
|
||||
SHA1 (patch-src_library_hh) = 3c7a220003b6a2accd0675ec223b89c1b843dc73
|
||||
SHA1 (patch-src_logger_hh) = 7ec25dc4d7b51d60e5390aef7b54d34efb66927e
|
||||
SHA1 (patch-src_parser_xpath.cc) = 9232423867197e066e78c4ec1614e2c583c8dcff
|
||||
SHA1 (patch-src_playbacksource_cc) = 5dd3d47b8a0306c344bace766f60d23b9bcdc6d0
|
||||
SHA1 (patch-src_playbacksource_hh) = a79da6855f3d581aea66c5713f76a45ca014b50e
|
||||
SHA1 (patch-src_sanity_h) = 82acd300b2c0ad7eaf7f9a63bb0df19d4e71dd2c
|
||||
SHA1 (patch-src_shell.cc) = f428d07ddbadf33fd9666b4b8e1bf757cb21a5aa
|
||||
SHA1 (patch-src_shell_hh) = b799ea9358b182ccc40c9c104be8fd6548b4c9dc
|
||||
SHA1 (patch-src_ui-part-cdda.hh) = 748a43c39ca720009af14affac6eb0b3b658e041
|
||||
SHA1 (patch-src_ui-part-podcasts_hh) = 0b73330a4ae7e3bd7d3b6d84817482916ee291ea
|
||||
SHA1 (patch-src_uri.cc) = 4fe811e8bebbabc61ef88ab2db2d0c2b8a5a2c61
|
||||
SHA1 (patch-src_urihandler_hh) = 01f4ecf27e351553ec7259deb88e91dbd1d9fd0e
|
||||
SHA1 (patch-src_util-file.cc) = e5a6eb49dc26670fae6388d8ad8476afb9d56f90
|
||||
|
|
@ -1,158 +0,0 @@
|
|||
$NetBSD: patch-aa,v 1.6 2008/10/28 22:23:40 wiz Exp $
|
||||
|
||||
--- configure.orig 2007-10-18 19:18:23.000000000 +0200
|
||||
+++ configure
|
||||
@@ -28551,7 +28551,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
|
||||
|
||||
{ echo "$as_me:$LINENO: checking whether $LD accepts --as-needed" >&5
|
||||
echo $ECHO_N "checking whether $LD accepts --as-needed... $ECHO_C" >&6; }
|
||||
-case `$LD --as-needed -v 2>&1 </dev/null` in
|
||||
+case false in
|
||||
*GNU* | *'with BFD'*)
|
||||
LDFLAGS="$LDFLAGS -Wl,--as-needed"
|
||||
{ echo "$as_me:$LINENO: result: yes" >&5
|
||||
@@ -31606,12 +31606,12 @@ echo $ECHO_N "checking for SOUP... $ECHO
|
||||
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2 >= 2.2.100\"") >&5
|
||||
- ($PKG_CONFIG --exists --print-errors "libsoup-2.2 >= 2.2.100") 2>&5
|
||||
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.3.0.1\"") >&5
|
||||
+ ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.3.0.1") 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; then
|
||||
- pkg_cv_SOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.2 >= 2.2.100" 2>/dev/null`
|
||||
+ pkg_cv_SOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4 >= 2.3.0.1" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
@@ -31620,12 +31620,12 @@ else
|
||||
fi
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2 >= 2.2.100\"") >&5
|
||||
- ($PKG_CONFIG --exists --print-errors "libsoup-2.2 >= 2.2.100") 2>&5
|
||||
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.3.0.1\"") >&5
|
||||
+ ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.3.0.1") 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; then
|
||||
- pkg_cv_SOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.2 >= 2.2.100" 2>/dev/null`
|
||||
+ pkg_cv_SOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4 >= 2.3.0.1" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
@@ -31634,18 +31634,18 @@ else
|
||||
fi
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
- SOUP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.2 >= 2.2.100"`
|
||||
+ SOUP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.4 >= 2.3.0.1"`
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$SOUP_PKG_ERRORS" 1>&5
|
||||
|
||||
- { { echo "$as_me:$LINENO: error: Package requirements (libsoup-2.2 >= 2.2.100) were not met.
|
||||
+ { { echo "$as_me:$LINENO: error: Package requirements (libsoup-2.4 >= 2.3.0.1) were not met.
|
||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||
installed software in a non-standard prefix.
|
||||
|
||||
Alternatively you may set the SOUP_CFLAGS and SOUP_LIBS environment variables
|
||||
to avoid the need to call pkg-config. See the pkg-config man page for
|
||||
more details." >&5
|
||||
-echo "$as_me: error: Package requirements (libsoup-2.2 >= 2.2.100) were not met.
|
||||
+echo "$as_me: error: Package requirements (libsoup-2.4 >= 2.3.0.1) were not met.
|
||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||
installed software in a non-standard prefix.
|
||||
|
||||
@@ -31683,90 +31683,6 @@ echo "${ECHO_T}yes" >&6; }
|
||||
:
|
||||
fi
|
||||
|
||||
- CPPFLAGS_SAVED="$CPPFLAGS"
|
||||
- CPPFLAGS="$CPPFLAGS $SOUP_CFLAGS"
|
||||
- export CPPFLAGS
|
||||
-
|
||||
- LDFLAGS_SAVED="$LDFLAGS"
|
||||
- LDFLAGS="$LDFLAGS $SOUP_LDFLAGS"
|
||||
- export LDFLAGS
|
||||
-
|
||||
- { echo "$as_me:$LINENO: checking for extern in libsoup headers" >&5
|
||||
-echo $ECHO_N "checking for extern in libsoup headers... $ECHO_C" >&6; }
|
||||
-
|
||||
- ac_ext=cpp
|
||||
-ac_cpp='$CXXCPP $CPPFLAGS'
|
||||
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
||||
-
|
||||
- cat >conftest.$ac_ext <<_ACEOF
|
||||
-/* confdefs.h. */
|
||||
-_ACEOF
|
||||
-cat confdefs.h >>conftest.$ac_ext
|
||||
-cat >>conftest.$ac_ext <<_ACEOF
|
||||
-/* end confdefs.h. */
|
||||
-
|
||||
- #include <libsoup/soup.h>
|
||||
-
|
||||
-int
|
||||
-main ()
|
||||
-{
|
||||
-
|
||||
- SoupSession * session = soup_session_sync_new ();
|
||||
-
|
||||
- ;
|
||||
- return 0;
|
||||
-}
|
||||
-_ACEOF
|
||||
-rm -f conftest.$ac_objext
|
||||
-if { (ac_try="$ac_compile"
|
||||
-case "(($ac_try" in
|
||||
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
- *) ac_try_echo=$ac_try;;
|
||||
-esac
|
||||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
- (eval "$ac_compile") 2>conftest.er1
|
||||
- ac_status=$?
|
||||
- grep -v '^ *+' conftest.er1 >conftest.err
|
||||
- rm -f conftest.er1
|
||||
- cat conftest.err >&5
|
||||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
- (exit $ac_status); } && {
|
||||
- test -z "$ac_cxx_werror_flag" ||
|
||||
- test ! -s conftest.err
|
||||
- } && test -s conftest.$ac_objext; then
|
||||
-
|
||||
- { echo "$as_me:$LINENO: result: no" >&5
|
||||
-echo "${ECHO_T}no" >&6; }
|
||||
-
|
||||
-else
|
||||
- echo "$as_me: failed program was:" >&5
|
||||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||||
-
|
||||
-
|
||||
- { echo "$as_me:$LINENO: result: yes" >&5
|
||||
-echo "${ECHO_T}yes" >&6; }
|
||||
-
|
||||
-cat >>confdefs.h <<\_ACEOF
|
||||
-#define LIBSOUP_HAS_EXTERN_C
|
||||
-_ACEOF
|
||||
-
|
||||
-
|
||||
-fi
|
||||
-
|
||||
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
- ac_ext=cpp
|
||||
-ac_cpp='$CXXCPP $CPPFLAGS'
|
||||
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
||||
-
|
||||
-
|
||||
- CPPFLAGS="$CPPFLAGS_SAVED"
|
||||
- LDFLAGS="$LDFLAGS_SAVED"
|
||||
-
|
||||
-
|
||||
# sqlite
|
||||
|
||||
pkg_failed=no
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
$NetBSD: patch-ab,v 1.6 2008/10/28 22:23:40 wiz Exp $
|
||||
|
||||
--- jnetlib/connection.cpp.orig 2008-03-05 21:31:04.000000000 +0000
|
||||
+++ jnetlib/connection.cpp
|
||||
@@ -224,8 +224,17 @@ void JNL_Connection::run(int max_send_by
|
||||
|
||||
if (select_retval == -1)
|
||||
#else
|
||||
+#ifdef __DragonFly__
|
||||
+ sigset_t cur_set;
|
||||
+ sigprocmask(SIG_SETMASK, &sigs, &cur_set);
|
||||
+ int select_retval = select(m_socket+1,&f[0],&f[1],&f[2],NULL);
|
||||
+ sigprocmask(SIG_SETMASK, &cur_set, NULL);
|
||||
+
|
||||
+ if (select_retval == -1)
|
||||
+#else
|
||||
if (pselect(m_socket+1,&f[0],&f[1],&f[2],&ts,&sigs)==-1)
|
||||
#endif
|
||||
+#endif
|
||||
{
|
||||
m_errorstr="connecting to host (calling select())";
|
||||
m_state=STATE_ERROR;
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
$NetBSD: patch-ac,v 1.4 2008/10/28 22:23:40 wiz Exp $
|
||||
|
||||
--- src/audio/audio.hh.orig 2008-03-05 21:31:05.000000000 +0000
|
||||
+++ src/audio/audio.hh
|
||||
@@ -126,7 +126,30 @@ namespace Bmp
|
||||
*/
|
||||
struct Element
|
||||
{
|
||||
- class Attr;
|
||||
+ /** An attribute holds a @link Bmp::Audio::Element::Attr::Value@endlink,
|
||||
+ * and a name (std::string)
|
||||
+ */
|
||||
+ struct Attr
|
||||
+ {
|
||||
+ /** boost::variant type for bool, int, double and string values
|
||||
+ */
|
||||
+ typedef boost::variant<bool, int, double, std::string> Value;
|
||||
+
|
||||
+ std::string name;
|
||||
+ Value value;
|
||||
+
|
||||
+ /** Default ctor
|
||||
+ */
|
||||
+ Attr () {}
|
||||
+
|
||||
+ /** Ctor taking the value, type and the name
|
||||
+ */
|
||||
+ Attr (std::string const& name,
|
||||
+ Value const& value)
|
||||
+ : name (name)
|
||||
+ , value (value)
|
||||
+ {}
|
||||
+ };
|
||||
|
||||
/** std::vector typedef of an Attr
|
||||
*/
|
||||
@@ -165,30 +188,6 @@ namespace Bmp
|
||||
}
|
||||
};
|
||||
|
||||
- /** An attribute holds a @link Bmp::Audio::Element::Attr::Value@endlink,
|
||||
- * and a name (std::string)
|
||||
- */
|
||||
- struct Element::Attr
|
||||
- {
|
||||
- /** boost::variant type for bool, int, double and string values
|
||||
- */
|
||||
- typedef boost::variant<bool, int, double, std::string> Value;
|
||||
-
|
||||
- std::string name;
|
||||
- Value value;
|
||||
-
|
||||
- /** Default ctor
|
||||
- */
|
||||
- Attr () {}
|
||||
-
|
||||
- /** Ctor taking the value, type and the name
|
||||
- */
|
||||
- Attr (std::string const& name,
|
||||
- Value const& value)
|
||||
- : name (name)
|
||||
- , value (value)
|
||||
- {}
|
||||
- };
|
||||
|
||||
/** Current state of the audio processing unit
|
||||
*/
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-ad,v 1.6 2008/10/28 22:23:40 wiz Exp $
|
||||
|
||||
--- README.orig 2008-04-06 10:10:55.000000000 +0000
|
||||
+++ README
|
||||
@@ -16,7 +16,7 @@ Requirements:
|
||||
* libglademm-2.4 >= 2.6.2
|
||||
* libsexymm >= 0.1.9
|
||||
* librsvg >= 2.14.0
|
||||
- * libsoup >= 2.2.100
|
||||
+ * libsoup >= 2.3.0.1
|
||||
* libofa >= 0.9.3
|
||||
* sqlite >= 3.3.11
|
||||
* libxml >= 2.6.1
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
$NetBSD: patch-ae,v 1.3 2008/10/28 22:23:40 wiz Exp $
|
||||
|
||||
--- configure.ac.orig 2008-04-06 10:10:55.000000000 +0000
|
||||
+++ configure.ac
|
||||
@@ -240,8 +240,7 @@ AC_ARG_WITH([pkgconfig-dir],
|
||||
AC_SUBST([pkgconfigdir])
|
||||
|
||||
# libsoup
|
||||
-PKG_CHECK_MODULES([SOUP], [libsoup-2.2 >= 2.2.100])
|
||||
-BMP_CHECK_SOUP_EXTERN_C
|
||||
+PKG_CHECK_MODULES([SOUP], [libsoup-2.4 >= 2.3.0.1])
|
||||
|
||||
# sqlite
|
||||
PKG_CHECK_MODULES([SQLITE], [sqlite3 >= 3.4])
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
$NetBSD: patch-af,v 1.1 2008/10/28 22:23:40 wiz Exp $
|
||||
|
||||
--- m4/soup.m4.orig 2008-03-05 21:31:03.000000000 +0000
|
||||
+++ m4/soup.m4
|
||||
@@ -1,4 +1,34 @@
|
||||
dnl -*- Mode: Autoconf; -*-
|
||||
+dnl -*- Mode: Autoconf; -*-
|
||||
+
|
||||
+AC_DEFUN([BMP_CHECK_SOUP_EXTERN_C],
|
||||
+[
|
||||
+ CPPFLAGS_SAVED="$CPPFLAGS"
|
||||
+ CPPFLAGS="$CPPFLAGS $SOUP_CFLAGS"
|
||||
+ export CPPFLAGS
|
||||
+
|
||||
+ LDFLAGS_SAVED="$LDFLAGS"
|
||||
+ LDFLAGS="$LDFLAGS $SOUP_LDFLAGS"
|
||||
+ export LDFLAGS
|
||||
+
|
||||
+ AC_MSG_CHECKING(for extern in libsoup headers)
|
||||
+
|
||||
+ AC_LANG_PUSH(C++)
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
||||
+ @%:@include <libsoup/soup.h>
|
||||
+ ]], [[
|
||||
+ SoupSession * session = soup_session_sync_new ();
|
||||
+ ]])],[
|
||||
+ AC_MSG_RESULT(no)
|
||||
+ ],[
|
||||
+ AC_MSG_RESULT(yes)
|
||||
+ AC_DEFINE(LIBSOUP_HAS_EXTERN_C,,[define if libsoup has extern c])
|
||||
+ ])
|
||||
+ AC_LANG_POP([C++])
|
||||
+
|
||||
+ CPPFLAGS="$CPPFLAGS_SAVED"
|
||||
+ LDFLAGS="$LDFLAGS_SAVED"
|
||||
+])
|
||||
|
||||
AC_DEFUN([BMP_CHECK_SOUP_EXTERN_C],
|
||||
[
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
$NetBSD: patch-ag,v 1.1 2008/10/28 22:23:40 wiz Exp $
|
||||
|
||||
--- sentinel/beep-media-player-2-sentinel.cc.orig 2008-04-05 23:53:08.000000000 +0000
|
||||
+++ sentinel/beep-media-player-2-sentinel.cc
|
||||
@@ -68,13 +68,7 @@
|
||||
#include <bmp/dbus.hh>
|
||||
#include <src/paths.hh>
|
||||
|
||||
-#ifndef LIBSOUP_HAS_EXTERN_C
|
||||
-G_BEGIN_DECLS
|
||||
-#endif
|
||||
#include <libsoup/soup.h>
|
||||
-#ifndef LIBSOUP_HAS_EXTERN_C
|
||||
-G_END_DECLS
|
||||
-#endif
|
||||
|
||||
#define SERVER_NAME "bmpx.backtrace.info"
|
||||
|
||||
|
|
@ -1,268 +0,0 @@
|
|||
$NetBSD: patch-ah,v 1.1 2008/10/28 22:23:40 wiz Exp $
|
||||
|
||||
--- src/minisoup.cc.orig 2008-03-05 21:31:06.000000000 +0000
|
||||
+++ src/minisoup.cc
|
||||
@@ -61,8 +61,8 @@ namespace Bmp
|
||||
{
|
||||
g_signal_connect (G_OBJECT (m_message), "got-chunk", G_CALLBACK (got_chunk), this);
|
||||
g_signal_connect (G_OBJECT (m_message), "restarted", G_CALLBACK (restarted), this);
|
||||
- soup_message_add_header_handler (m_message, "content-length", SOUP_HANDLER_PRE_BODY,
|
||||
- SoupMessageCallbackFn (got_content_length), this);
|
||||
+ soup_message_add_header_handler (m_message, "got-headers", "content-length",
|
||||
+ G_CALLBACK (got_content_length), this);
|
||||
return soup_session_send_message (m_session, m_message);
|
||||
}
|
||||
|
||||
@@ -76,26 +76,26 @@ namespace Bmp
|
||||
RequestSync::get_data ()
|
||||
{
|
||||
std::string buffer;
|
||||
- buffer.append (m_message->response.body, m_message->response.length);
|
||||
+ buffer.append (m_message->response_body->data, m_message->response_body->length);
|
||||
return buffer;
|
||||
}
|
||||
|
||||
void
|
||||
RequestSync::get_data (std::string & buffer)
|
||||
{
|
||||
- buffer.append (m_message->response.body, m_message->response.length);
|
||||
+ buffer.append (m_message->response_body->data, m_message->response_body->length);
|
||||
}
|
||||
|
||||
char const*
|
||||
RequestSync::get_data_raw ()
|
||||
{
|
||||
- return m_message->response.body;
|
||||
+ return m_message->response_body->data;
|
||||
}
|
||||
|
||||
guint
|
||||
RequestSync::get_data_size ()
|
||||
{
|
||||
- return m_message->response.length;
|
||||
+ return m_message->response_body->length;
|
||||
}
|
||||
|
||||
|
||||
@@ -103,15 +103,15 @@ namespace Bmp
|
||||
RequestSync::add_header (std::string const& name,
|
||||
std::string const& value)
|
||||
{
|
||||
- soup_message_add_header (m_message->request_headers, name.c_str(), value.c_str());
|
||||
+ soup_message_headers_append (m_message->request_headers, name.c_str(), value.c_str());
|
||||
}
|
||||
|
||||
void
|
||||
RequestSync::add_request (std::string const& type,
|
||||
std::string const& request)
|
||||
{
|
||||
- soup_message_set_request (m_message, type.c_str(), SOUP_BUFFER_SYSTEM_OWNED /* we can't rely on the std::string not being destroyed */,
|
||||
- g_strdup (const_cast<char*>(request.c_str())), strlen (request.c_str()));
|
||||
+ soup_message_set_request (m_message, type.c_str(), SOUP_MEMORY_COPY,
|
||||
+ request.c_str(), strlen (request.c_str()));
|
||||
m_post = true;
|
||||
}
|
||||
|
||||
@@ -126,11 +126,11 @@ namespace Bmp
|
||||
}
|
||||
|
||||
void
|
||||
- RequestSync::got_chunk (SoupMessage* message, gpointer data)
|
||||
+ RequestSync::got_chunk (SoupMessage* message, SoupBuffer* chunk, gpointer data)
|
||||
{
|
||||
RequestSync & request = (*(reinterpret_cast<RequestSync*>(data)));
|
||||
|
||||
- request.m_read += message->response.length;
|
||||
+ request.m_read += chunk->length;
|
||||
double percent = (double (request.m_read) / double (request.m_size));
|
||||
if(percent >= 0. && percent <= 1.)
|
||||
{
|
||||
@@ -142,7 +142,7 @@ namespace Bmp
|
||||
RequestSync::got_content_length (SoupMessage* message, gpointer data)
|
||||
{
|
||||
RequestSync & request = (*(reinterpret_cast<RequestSync*>(data)));
|
||||
- request.m_size = g_ascii_strtoull (soup_message_get_header (message->response_headers, "content-length"), NULL, 10);
|
||||
+ request.m_size = soup_message_headers_get_content_length (message->response_headers);
|
||||
}
|
||||
|
||||
|
||||
@@ -181,17 +181,17 @@ namespace Bmp
|
||||
return m_message->status_code;
|
||||
}
|
||||
|
||||
- guint
|
||||
- Request::message_status ()
|
||||
- {
|
||||
- return m_message->status;
|
||||
- }
|
||||
+ //guint
|
||||
+ //Request::message_status ()
|
||||
+ //{
|
||||
+ // return m_message->status;
|
||||
+ //}
|
||||
|
||||
void
|
||||
Request::run ()
|
||||
{
|
||||
g_signal_connect (G_OBJECT (m_message), "restarted", G_CALLBACK (restarted), this);
|
||||
- soup_session_queue_message (m_session, m_message, SoupMessageCallbackFn (got_answer), this);
|
||||
+ soup_session_queue_message (m_session, m_message, SoupSessionCallback (got_answer), this);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -200,9 +200,6 @@ namespace Bmp
|
||||
if (G_IS_OBJECT(m_session))
|
||||
{
|
||||
soup_session_abort (m_session);
|
||||
- //soup_message_set_status (m_message, SOUP_STATUS_CANCELLED);
|
||||
- //soup_session_cancel_message (m_session, m_message);
|
||||
- //m_message = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -211,15 +208,15 @@ namespace Bmp
|
||||
Request::add_header (std::string const& name,
|
||||
std::string const& value)
|
||||
{
|
||||
- soup_message_add_header (m_message->request_headers, name.c_str(), value.c_str());
|
||||
+ soup_message_headers_append (m_message->request_headers, name.c_str(), value.c_str());
|
||||
}
|
||||
|
||||
void
|
||||
Request::add_request (std::string const& type,
|
||||
std::string const& request)
|
||||
{
|
||||
- soup_message_set_request (m_message, type.c_str(), SOUP_BUFFER_SYSTEM_OWNED /* we can't rely on the std::string not being destroyed */,
|
||||
- g_strdup (const_cast<char*>(request.c_str())), strlen (request.c_str()));
|
||||
+ soup_message_set_request (m_message, type.c_str(), SOUP_MEMORY_COPY,
|
||||
+ request.c_str(), strlen (request.c_str()));
|
||||
m_post = true;
|
||||
}
|
||||
|
||||
@@ -231,7 +228,7 @@ namespace Bmp
|
||||
}
|
||||
|
||||
void
|
||||
- Request::got_answer (SoupMessage* message, gpointer data)
|
||||
+ Request::got_answer (SoupSession* session, SoupMessage* message, gpointer data)
|
||||
{
|
||||
Request & request = (*(reinterpret_cast<Request*>(data)));
|
||||
|
||||
@@ -242,15 +239,12 @@ namespace Bmp
|
||||
if( block )
|
||||
return;
|
||||
|
||||
- if( request.m_message->status != SOUP_MESSAGE_STATUS_FINISHED )
|
||||
- return;
|
||||
-
|
||||
//if( request.m_message->status_code == SOUP_STATUS_CANCELLED )
|
||||
//return;
|
||||
|
||||
request.Signals.Callback.emit(
|
||||
- request.m_message->response.body,
|
||||
- request.m_message->response.length,
|
||||
+ request.m_message->response_body->data,
|
||||
+ request.m_message->response_body->length,
|
||||
request.m_message->status_code
|
||||
);
|
||||
}
|
||||
@@ -270,6 +264,7 @@ namespace Bmp
|
||||
|
||||
m_session = soup_session_async_new ();
|
||||
m_message = soup_message_new ("GET", m_url.c_str());
|
||||
+ soup_message_set_flags (m_message, SOUP_MESSAGE_OVERWRITE_CHUNKS);
|
||||
}
|
||||
|
||||
Glib::RefPtr<RequestFile>
|
||||
@@ -280,9 +275,9 @@ namespace Bmp
|
||||
|
||||
RequestFile::~RequestFile ()
|
||||
{
|
||||
- if (G_IS_OBJECT(m_message) && m_message->status == SOUP_MESSAGE_STATUS_RUNNING)
|
||||
+ if (m_file.is_open())
|
||||
{
|
||||
- cancel ();
|
||||
+ cancel ();
|
||||
Signals.Aborted.emit ((boost::format (_("Download of file '%s' was cancelled prematurely!")) % filename_to_utf8 (m_filename).c_str()).str());
|
||||
}
|
||||
g_object_unref (m_session);
|
||||
@@ -317,9 +312,9 @@ namespace Bmp
|
||||
{
|
||||
g_signal_connect (G_OBJECT (m_message), "got-chunk", G_CALLBACK (got_chunk), this);
|
||||
g_signal_connect (G_OBJECT (m_message), "restarted", G_CALLBACK (restarted), this);
|
||||
- soup_message_add_header_handler (m_message, "content-length", SOUP_HANDLER_PRE_BODY,
|
||||
- SoupMessageCallbackFn (got_content_length), this);
|
||||
- soup_session_queue_message (m_session, m_message, SoupMessageCallbackFn (got_answer), this);
|
||||
+ soup_message_add_header_handler (m_message, "got-headers", "content-length",
|
||||
+ G_CALLBACK (got_content_length), this);
|
||||
+ soup_session_queue_message (m_session, m_message, SoupSessionCallback (got_answer), this);
|
||||
fileOpen ();
|
||||
}
|
||||
|
||||
@@ -328,8 +323,7 @@ namespace Bmp
|
||||
{
|
||||
if (G_IS_OBJECT(m_message))
|
||||
{
|
||||
- soup_message_set_status (m_message, SOUP_STATUS_CANCELLED);
|
||||
- soup_session_cancel_message (m_session, m_message);
|
||||
+ soup_session_cancel_message (m_session, m_message, SOUP_STATUS_CANCELLED);
|
||||
m_message = 0;
|
||||
}
|
||||
|
||||
@@ -341,7 +335,7 @@ namespace Bmp
|
||||
RequestFile::add_header (std::string const& name,
|
||||
std::string const& value)
|
||||
{
|
||||
- soup_message_add_header (m_message->request_headers, name.c_str(), value.c_str());
|
||||
+ soup_message_headers_append (m_message->request_headers, name.c_str(), value.c_str());
|
||||
}
|
||||
|
||||
|
||||
@@ -357,7 +351,7 @@ namespace Bmp
|
||||
}
|
||||
|
||||
void
|
||||
- RequestFile::got_answer (SoupMessage* message, gpointer data)
|
||||
+ RequestFile::got_answer (SoupSession* session, SoupMessage* message, gpointer data)
|
||||
{
|
||||
RequestFile & request = (*(reinterpret_cast<RequestFile*>(data)));
|
||||
|
||||
@@ -369,25 +363,22 @@ namespace Bmp
|
||||
return;
|
||||
}
|
||||
|
||||
- if( request.m_message->status != SOUP_MESSAGE_STATUS_FINISHED )
|
||||
- return;
|
||||
-
|
||||
if( request.m_message->status_code == SOUP_STATUS_CANCELLED)
|
||||
return;
|
||||
|
||||
- debug("soup","%s: status: %d, status_code: %d", G_STRLOC, request.m_message->status, request.m_message->status_code);
|
||||
+ debug("soup","%s: status_code: %d", G_STRLOC, request.m_message->status_code);
|
||||
|
||||
request.fileClose ();
|
||||
request.Signals.Done.emit (request.m_filename);
|
||||
}
|
||||
|
||||
void
|
||||
- RequestFile::got_chunk (SoupMessage* message, gpointer data)
|
||||
+ RequestFile::got_chunk (SoupMessage* message, SoupBuffer* chunk, gpointer data)
|
||||
{
|
||||
RequestFile & request = (*(reinterpret_cast<RequestFile*>(data)));
|
||||
|
||||
- request.m_file.write (message->response.body, message->response.length);
|
||||
- request.m_read += message->response.length;
|
||||
+ request.m_file.write (chunk->data, chunk->length);
|
||||
+ request.m_read += chunk->length;
|
||||
|
||||
double percent = (double (request.m_read) / double (request.m_size));
|
||||
if(percent >= 0. && percent <= 1.)
|
||||
@@ -400,7 +391,7 @@ namespace Bmp
|
||||
RequestFile::got_content_length (SoupMessage* message, gpointer data)
|
||||
{
|
||||
RequestFile & request = (*(reinterpret_cast<RequestFile*>(data)));
|
||||
- request.m_size = g_ascii_strtoull (soup_message_get_header (message->response_headers, "content-length"), NULL, 10);
|
||||
+ request.m_size = soup_message_headers_get_content_length (message->response_headers);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
$NetBSD: patch-ai,v 1.1 2008/10/28 22:23:40 wiz Exp $
|
||||
|
||||
--- src/minisoup.hh.orig 2008-03-05 21:31:06.000000000 +0000
|
||||
+++ src/minisoup.hh
|
||||
@@ -33,13 +33,7 @@
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
|
||||
-#ifndef LIBSOUP_HAS_EXTERN_C
|
||||
-G_BEGIN_DECLS
|
||||
-# include <libsoup/soup.h>
|
||||
-G_END_DECLS
|
||||
-#else
|
||||
-# include <libsoup/soup.h>
|
||||
-#endif // !LIBSOUP_HAS_EXTERN_C
|
||||
+#include <libsoup/soup.h>
|
||||
|
||||
namespace Bmp
|
||||
{
|
||||
@@ -111,7 +105,7 @@ namespace Bmp
|
||||
restarted (SoupMessage* /*message*/, gpointer /*data*/);
|
||||
|
||||
static void
|
||||
- got_chunk (SoupMessage* /*message*/, gpointer /*data*/);
|
||||
+ got_chunk (SoupMessage* /*message*/, SoupBuffer* /*chunk*/, gpointer /*data*/);
|
||||
|
||||
static void
|
||||
got_content_length (SoupMessage* /*message*/, gpointer /*data*/);
|
||||
@@ -161,7 +155,7 @@ namespace Bmp
|
||||
restarted (SoupMessage* /*message*/, gpointer /*data*/);
|
||||
|
||||
static void
|
||||
- got_answer (SoupMessage* /*message*/, gpointer /*data*/);
|
||||
+ got_answer (SoupSession* /*session*/, SoupMessage* /*message*/, gpointer /*data*/);
|
||||
};
|
||||
|
||||
|
||||
@@ -224,10 +218,10 @@ namespace Bmp
|
||||
restarted (SoupMessage* /*message*/, gpointer /*data*/);
|
||||
|
||||
static void
|
||||
- got_answer (SoupMessage* /*message*/, gpointer /*data*/);
|
||||
+ got_answer (SoupSession* /*session*/, SoupMessage* /*message*/, gpointer /*data*/);
|
||||
|
||||
static void
|
||||
- got_chunk (SoupMessage* /*message*/, gpointer /*data*/);
|
||||
+ got_chunk (SoupMessage* /*message*/, SoupBuffer* /*chunk*/, gpointer /*data*/);
|
||||
|
||||
static void
|
||||
got_content_length (SoupMessage* /*message*/, gpointer /*data*/);
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-aj,v 1.1 2009/03/26 23:12:22 wiz Exp $
|
||||
|
||||
--- widgets/popup.cc.orig 2008-03-05 21:31:12.000000000 +0000
|
||||
+++ widgets/popup.cc
|
||||
@@ -308,7 +308,7 @@ namespace Bmp
|
||||
|
||||
if (m_location == ARROW_TOP)
|
||||
{
|
||||
- Cairo::Matrix matrix = { 1, 0, 0, -1, 0, h };
|
||||
+ Cairo::Matrix matrix ( 1, 0, 0, -1, 0, h );
|
||||
cr->set_matrix (matrix);
|
||||
}
|
||||
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-ak,v 1.1 2011/01/17 14:30:06 drochner Exp $
|
||||
|
||||
--- src/dialog-about.cc.orig 2008-03-05 21:31:06.000000000 +0000
|
||||
+++ src/dialog-about.cc
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <glib/gi18n.h>
|
||||
#include <gdk/gdk.h>
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
-#include <gdkmm/general.h>
|
||||
+#include <gdkmm.h>
|
||||
#include <cairomm/cairomm.h>
|
||||
#include <boost/format.hpp>
|
||||
#include <cmath>
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
$NetBSD: patch-library_cc,v 1.1 2011/10/08 06:08:27 dholland Exp $
|
||||
|
||||
Fix build with newer C++ compilers.
|
||||
|
||||
--- src/library.cc~ 2008-03-05 21:31:06.000000000 +0000
|
||||
+++ src/library.cc
|
||||
@@ -530,7 +530,7 @@ namespace Bmp
|
||||
gint64 length_in_nanoseconds;
|
||||
gst_query_parse_duration (query, &format, &length_in_nanoseconds);
|
||||
guint64 length = length_in_nanoseconds / GST_SECOND;
|
||||
- ttuple->row->insert (std::make_pair (attrinfo[ATTRIBUTE_TIME].id, Variant (length)));
|
||||
+ ttuple->row->insert (std::make_pair (attrinfo[ATTRIBUTE_TIME].id, Bmp::DB::Variant (length)));
|
||||
}
|
||||
gst_query_unref (query);
|
||||
gst_element_set_state (GST_ELEMENT (element), GST_STATE_NULL);
|
||||
@@ -921,7 +921,7 @@ namespace Bmp
|
||||
}
|
||||
#endif //HAVE_HAL
|
||||
|
||||
- row.insert (std::make_pair ("insert_path", Variant (string (insert_path))));
|
||||
+ row.insert (std::make_pair ("insert_path", Bmp::DB::Variant (string (insert_path))));
|
||||
row.insert (std::make_pair (attrinfo[ATTRIBUTE_NEW_ITEM].id, guint64 (1)));
|
||||
|
||||
struct stat fstat;
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
$NetBSD: patch-mcs_gtk-bind.h,v 1.1 2011/11/26 17:08:51 joerg Exp $
|
||||
|
||||
--- mcs/gtk-bind.h.orig 2011-11-26 14:44:14.000000000 +0000
|
||||
+++ mcs/gtk-bind.h
|
||||
@@ -92,7 +92,7 @@ namespace Mcs
|
||||
|
||||
public:
|
||||
|
||||
- Bind (Mcs::Mcs * mcs);
|
||||
+ Bind (Mcs * mcs);
|
||||
~Bind ();
|
||||
|
||||
void
|
||||
@@ -147,7 +147,7 @@ namespace Mcs
|
||||
|
||||
private:
|
||||
|
||||
- Mcs::Mcs *mcs;
|
||||
+ Mcs *mcs;
|
||||
|
||||
void
|
||||
action_toggled_cb (Glib::RefPtr<Gtk::ToggleAction> const& toggle_action,
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-plugins_vfs_container_libcontainer__folder.cc,v 1.1 2012/11/16 20:05:35 joerg Exp $
|
||||
|
||||
--- plugins/vfs/container/libcontainer_folder.cc.orig 2012-11-16 13:51:32.000000000 +0000
|
||||
+++ plugins/vfs/container/libcontainer_folder.cc
|
||||
@@ -56,8 +56,8 @@ namespace Bmp
|
||||
Bmp::URI u (uri);
|
||||
if (u.get_protocol () != Bmp::URI::PROTOCOL_FILE) return false;
|
||||
u.unescape ();
|
||||
- ustring uri ((u));
|
||||
- std::string path = filename_from_uri (uri);
|
||||
+ ustring uri2 ((u));
|
||||
+ std::string path = filename_from_uri (uri2);
|
||||
return file_test (path, FILE_TEST_IS_DIR);
|
||||
}
|
||||
catch (...) { return false; }
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-src_amazon.cc,v 1.1 2016/12/22 20:58:40 joerg Exp $
|
||||
|
||||
operator bool of RefPtr<> is explicit, so force the conversion.
|
||||
|
||||
--- src/amazon.cc.orig 2016-12-22 12:54:02.224939332 +0000
|
||||
+++ src/amazon.cc
|
||||
@@ -121,7 +121,7 @@ namespace Bmp
|
||||
{
|
||||
cover = RefPtr<Gdk::Pixbuf> (0);
|
||||
}
|
||||
- return cover;
|
||||
+ return bool(cover);
|
||||
}
|
||||
|
||||
RefPtr<Gdk::Pixbuf>
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
$NetBSD: patch-src_debug.cc,v 1.1 2012/11/16 20:05:35 joerg Exp $
|
||||
|
||||
--- src/debug.cc.orig 2012-11-16 14:01:18.000000000 +0000
|
||||
+++ src/debug.cc
|
||||
@@ -76,8 +76,7 @@ namespace Bmp
|
||||
|
||||
void
|
||||
debug (const std::string &domain,
|
||||
- const std::string &format,
|
||||
- ...)
|
||||
+ const char *format, ...)
|
||||
{
|
||||
if( !use_debug )
|
||||
return;
|
||||
@@ -88,7 +87,7 @@ namespace Bmp
|
||||
|
||||
va_start (args, format);
|
||||
std::string domain_full = std::string("bmpx-") + domain;
|
||||
- g_logv (domain_full.c_str (), G_LOG_LEVEL_INFO, format.c_str (), args);
|
||||
+ g_logv (domain_full.c_str (), G_LOG_LEVEL_INFO, format, args);
|
||||
va_end (args);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-src_debug.hh,v 1.1 2012/11/16 20:05:35 joerg Exp $
|
||||
|
||||
--- src/debug.hh.orig 2012-11-16 14:00:54.000000000 +0000
|
||||
+++ src/debug.hh
|
||||
@@ -37,9 +37,7 @@ namespace Bmp
|
||||
debug_init ();
|
||||
|
||||
void
|
||||
- debug (const std::string &domain,
|
||||
- const std::string &format,
|
||||
- ...);
|
||||
+ debug (const std::string &domain, const char *format, ...);
|
||||
}
|
||||
|
||||
#endif // BMP_DEBUG_HPP
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-src_dialog-progress_hh,v 1.1 2012/05/06 19:35:57 dholland Exp $
|
||||
|
||||
Fix build with latest glib2.
|
||||
|
||||
--- src/dialog-progress.hh~ 2008-03-05 21:31:06.000000000 +0000
|
||||
+++ src/dialog-progress.hh
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
#include <glibmm/ustring.h>
|
||||
#include <gtkmm/dialog.h>
|
||||
#include <gtkmm/progressbar.h>
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-src_dialog-simple-progress_hh,v 1.1 2012/05/06 19:35:57 dholland Exp $
|
||||
|
||||
Fix build with latest glib2.
|
||||
|
||||
--- src/dialog-simple-progress.hh~ 2008-03-05 21:31:06.000000000 +0000
|
||||
+++ src/dialog-simple-progress.hh
|
||||
@@ -29,7 +29,7 @@
|
||||
# include <config.h>
|
||||
#endif //HAVE_CONFIG_H
|
||||
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
#include <glibmm/ustring.h>
|
||||
#include <gtkmm/dialog.h>
|
||||
#include <gtkmm/progressbar.h>
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-src_hal_hh,v 1.1 2012/05/06 19:35:57 dholland Exp $
|
||||
|
||||
Fix build with latest glib2.
|
||||
|
||||
--- src/hal.hh~ 2008-04-02 20:11:49.000000000 +0000
|
||||
+++ src/hal.hh
|
||||
@@ -33,7 +33,7 @@
|
||||
#include <map>
|
||||
#include <vector>
|
||||
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
#include <glibmm/ustring.h>
|
||||
|
||||
#include <dbus/dbus.h>
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-src_jamendodata-libxml2-sax_cc,v 1.1 2012/05/06 19:35:57 dholland Exp $
|
||||
|
||||
Fix build with latest glib2.
|
||||
|
||||
--- src/jamendodata-libxml2-sax.cc~ 2008-03-05 21:31:06.000000000 +0000
|
||||
+++ src/jamendodata-libxml2-sax.cc
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <boost/format.hpp>
|
||||
|
||||
#include <glibmm/ustring.h>
|
||||
-#include <glib/gmessages.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "jamendodata-libxml2-sax.hh"
|
||||
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
$NetBSD: patch-src_lastfm.cc,v 1.1 2012/11/16 20:05:35 joerg Exp $
|
||||
|
||||
--- src/lastfm.cc.orig 2012-11-16 15:11:53.000000000 +0000
|
||||
+++ src/lastfm.cc
|
||||
@@ -811,12 +811,12 @@ namespace Bmp
|
||||
|
||||
xmlDocSetRootElement (doc, lqm);
|
||||
|
||||
- for (LQM::size_type n = 0 ; n < m_queue.size(); ++n)
|
||||
+ for (LQM::size_type n2 = 0 ; n2 < m_queue.size(); ++n2)
|
||||
{
|
||||
static boost::format uint64_f ("%llu");
|
||||
static boost::format uint_f ("%u");
|
||||
|
||||
- TrackQueueItem const& i (m_queue[n]);
|
||||
+ TrackQueueItem const& i (m_queue[n2]);
|
||||
|
||||
xmlNodePtr n = xmlNewChild (q, bmp, BAD_CAST N_LQM_TRACK, 0);
|
||||
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-src_library_hh,v 1.1 2012/05/06 19:35:57 dholland Exp $
|
||||
|
||||
Fix build with latest glib2.
|
||||
|
||||
--- src/library.hh~ 2008-03-05 21:31:06.000000000 +0000
|
||||
+++ src/library.hh
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
#include <glibmm/ustring.h>
|
||||
#include <sigc++/signal.h>
|
||||
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-src_logger_hh,v 1.1 2012/05/06 19:35:57 dholland Exp $
|
||||
|
||||
Fix build with latest glib2.
|
||||
|
||||
--- src/logger.hh~ 2008-03-05 21:31:06.000000000 +0000
|
||||
+++ src/logger.hh
|
||||
@@ -33,7 +33,7 @@
|
||||
#include <fstream>
|
||||
#include <string>
|
||||
|
||||
-#include <glib/gmessages.h>
|
||||
+#include <glib.h>
|
||||
#include <glibmm/thread.h>
|
||||
#include <glibmm/ustring.h>
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
$NetBSD: patch-src_parser_xpath.cc,v 1.1 2014/04/19 14:46:06 joerg Exp $
|
||||
|
||||
--- src/parser/xpath.cc.orig 2014-04-19 11:54:39.000000000 +0000
|
||||
+++ src/parser/xpath.cc
|
||||
@@ -11,6 +11,7 @@
|
||||
#include "xpath.hh"
|
||||
#include <algorithm> // for lexicographical_compare
|
||||
#include <cassert>
|
||||
+#include <ostream>
|
||||
|
||||
// implementation -----------------------------------------------------------//
|
||||
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-src_playbacksource_cc,v 1.1 2012/05/06 19:35:57 dholland Exp $
|
||||
|
||||
Fix build with latest glib2.
|
||||
|
||||
--- src/playbacksource.cc~ 2008-03-05 21:31:06.000000000 +0000
|
||||
+++ src/playbacksource.cc
|
||||
@@ -26,7 +26,7 @@
|
||||
#endif //HAVE_CONFIG_H
|
||||
|
||||
#include <exception>
|
||||
-#include <glib/ghash.h>
|
||||
+#include <glib.h>
|
||||
#include <glibmm/ustring.h>
|
||||
#include <glibmm/i18n.h>
|
||||
#include <sigc++/signal.h>
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-src_playbacksource_hh,v 1.1 2012/05/06 19:35:57 dholland Exp $
|
||||
|
||||
Fix build with latest glib2.
|
||||
|
||||
--- src/playbacksource.hh~ 2008-03-05 21:31:06.000000000 +0000
|
||||
+++ src/playbacksource.hh
|
||||
@@ -28,7 +28,7 @@
|
||||
# include <config.h>
|
||||
#endif //HAVE_CONFIG_H
|
||||
|
||||
-#include <glib/ghash.h>
|
||||
+#include <glib.h>
|
||||
#include <glibmm/ustring.h>
|
||||
#include <sigc++/signal.h>
|
||||
#include <boost/format.hpp>
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-src_sanity_h,v 1.1 2012/05/06 19:27:12 dholland Exp $
|
||||
|
||||
Fix build with latest glib2.
|
||||
|
||||
--- src/sanity.h~ 2008-03-05 21:31:06.000000000 +0000
|
||||
+++ src/sanity.h
|
||||
@@ -21,7 +21,7 @@
|
||||
#ifndef BMP_SANITY_HPP
|
||||
#define BMP_SANITY_HPP
|
||||
|
||||
-#include <glib/gmacros.h>
|
||||
+#include <glib.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
$NetBSD: patch-src_shell.cc,v 1.1 2013/03/28 21:43:05 joerg Exp $
|
||||
|
||||
--- src/shell.cc.orig 2013-03-28 12:01:36.000000000 +0000
|
||||
+++ src/shell.cc
|
||||
@@ -1288,7 +1288,6 @@ namespace Bmp
|
||||
static guint mpris_player_signals[LAST_SIGNAL] = { 0 };
|
||||
}
|
||||
|
||||
- class PlayerShell::Player;
|
||||
struct PlayerClass
|
||||
{
|
||||
GObjectClass parent;
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
$NetBSD: patch-src_shell_hh,v 1.1 2012/05/06 19:35:57 dholland Exp $
|
||||
|
||||
Fix build with latest glib2.
|
||||
|
||||
--- src/shell.hh~ 2008-03-05 21:31:06.000000000 +0000
|
||||
+++ src/shell.hh
|
||||
@@ -32,8 +32,7 @@
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
-#include <glib/gtypes.h>
|
||||
-#include <glib/ghash.h>
|
||||
+#include <glib.h>
|
||||
#include <glibmm/main.h>
|
||||
#include <glibmm/ustring.h>
|
||||
#include <gdkmm/pixbuf.h>
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-src_ui-part-cdda.hh,v 1.1 2012/11/16 20:05:35 joerg Exp $
|
||||
|
||||
--- src/ui-part-cdda.hh.orig 2012-11-16 15:04:58.000000000 +0000
|
||||
+++ src/ui-part-cdda.hh
|
||||
@@ -209,7 +209,7 @@ namespace Bmp
|
||||
|
||||
struct LabelT
|
||||
{
|
||||
- Gtk::Label * Album,;
|
||||
+ Gtk::Label * Album;
|
||||
Gtk::Label * Artist;
|
||||
Gtk::Label * Date;
|
||||
};
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-src_ui-part-podcasts_hh,v 1.1 2012/05/06 19:35:57 dholland Exp $
|
||||
|
||||
Fix build with latest glib2.
|
||||
|
||||
--- src/ui-part-podcasts.hh~ 2008-03-05 21:31:06.000000000 +0000
|
||||
+++ src/ui-part-podcasts.hh
|
||||
@@ -34,7 +34,7 @@
|
||||
#include <ctime>
|
||||
#include <map>
|
||||
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
#include <glibmm/ustring.h>
|
||||
#include <gdkmm/pixbuf.h>
|
||||
#include <gtkmm/liststore.h>
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
$NetBSD: patch-src_uri.cc,v 1.1 2013/03/31 08:18:58 sbd Exp $
|
||||
|
||||
--- src/uri.cc.orig 2008-04-05 23:49:24.000000000 +0000
|
||||
+++ src/uri.cc
|
||||
@@ -40,6 +40,7 @@
|
||||
#include <glibmm.h>
|
||||
#include <iostream>
|
||||
#include <cstring>
|
||||
+#include <cstdio>
|
||||
|
||||
#include "debug.hh"
|
||||
#include "uri.hh"
|
||||
@@ -227,7 +228,7 @@ char *path_escape(const char *path)
|
||||
if (path_escape_ch(*pnt))
|
||||
{
|
||||
/* Escape it - %<hex><hex> */
|
||||
- sprintf(p, "%%%02x", (unsigned char) *pnt);
|
||||
+ std::sprintf(p, "%%%02x", (unsigned char) *pnt);
|
||||
p += 3;
|
||||
} else {
|
||||
*p++ = *pnt;
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-src_urihandler_hh,v 1.1 2012/05/06 19:35:58 dholland Exp $
|
||||
|
||||
Fix build with latest glib2.
|
||||
|
||||
--- src/urihandler.hh~ 2008-03-05 21:31:06.000000000 +0000
|
||||
+++ src/urihandler.hh
|
||||
@@ -28,7 +28,7 @@
|
||||
# include <config.h>
|
||||
#endif //HAVE_CONFIG_H
|
||||
|
||||
-#include <glib/ghash.h>
|
||||
+#include <glib.h>
|
||||
#include <glibmm/ustring.h>
|
||||
#include <sigc++/signal.h>
|
||||
#include <boost/format.hpp>
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
$NetBSD: patch-src_util-file.cc,v 1.1 2012/11/16 20:05:35 joerg Exp $
|
||||
|
||||
--- src/util-file.cc.orig 2012-11-16 14:36:30.000000000 +0000
|
||||
+++ src/util-file.cc
|
||||
@@ -270,12 +270,12 @@ namespace Bmp
|
||||
if (!Audio::typefind (*i, type))
|
||||
return false;
|
||||
|
||||
- Library::TaglibPluginsMap::const_iterator i (plugins.find (type));
|
||||
+ Library::TaglibPluginsMap::const_iterator i2 (plugins.find (type));
|
||||
|
||||
- if (i == plugins.end())
|
||||
+ if (i2 == plugins.end())
|
||||
return false;
|
||||
|
||||
- if (!i->second->set)
|
||||
+ if (!i2->second->set)
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
Loading…
Reference in a new issue